Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
818ae4a6df | ||
|
|
0de0e809ac | ||
|
|
da727c0a0b | ||
|
|
4841a65c77 | ||
|
|
0ec4b619d9 | ||
|
|
12f05adde7 | ||
|
|
c594e8bd71 | ||
|
|
f84166406f | ||
|
|
82b2ba298d | ||
|
|
38b6805ba1 | ||
|
|
6a7a582045 | ||
|
|
c53a00b4ba | ||
|
|
52103c775b |
@@ -1 +1,2 @@
|
||||
#!/bin/sh
|
||||
npx lint-staged
|
||||
|
||||
@@ -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.2.5
|
||||
version: 0.2.7
|
||||
|
||||
# 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.20.1"
|
||||
appVersion: "1.21.1"
|
||||
|
||||
dependencies:
|
||||
- alias: postgresql
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
REACT_APP_VERSION=1.20.1
|
||||
Generated
+3
-3
@@ -24943,9 +24943,9 @@
|
||||
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
|
||||
},
|
||||
"node_modules/socket.io-parser": {
|
||||
"version": "3.3.3",
|
||||
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz",
|
||||
"integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==",
|
||||
"version": "3.3.4",
|
||||
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.4.tgz",
|
||||
"integrity": "sha512-z/pFQB3x+EZldRRzORYW1vwVO8m/3ILkswtnpoeU6Ve3cbMWkmHEWDAVJn4QJtchiiFTo5j7UG2QvwxvaA9vow==",
|
||||
"dependencies": {
|
||||
"component-emitter": "~1.3.0",
|
||||
"debug": "~3.1.0",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<meta
|
||||
name="description"
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
:global(#app) {
|
||||
.wrapper {
|
||||
height: 100%;
|
||||
max-height: 100vh;
|
||||
max-width: 100vw;
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
z-index: -1;
|
||||
|
||||
@@ -48,16 +48,6 @@
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.panel {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.panelItem {
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
margin: 0 20px;
|
||||
}
|
||||
|
||||
@@ -3,12 +3,13 @@
|
||||
align-items: center;
|
||||
display: flex;
|
||||
flex: 0 0 auto;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.actions {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
gap: 20px;
|
||||
justify-content: flex-start;
|
||||
margin: 20px 20px;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,10 @@
|
||||
transition: width 0.2s ease;
|
||||
width: 280px;
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
width: 220px;
|
||||
}
|
||||
|
||||
input {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ const Card = React.memo(
|
||||
index,
|
||||
name,
|
||||
dueDate,
|
||||
isDueDateCompleted,
|
||||
stopwatch,
|
||||
coverUrl,
|
||||
boardId,
|
||||
@@ -120,7 +121,7 @@ const Card = React.memo(
|
||||
)}
|
||||
{dueDate && (
|
||||
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
||||
<DueDate value={dueDate} size="tiny" />
|
||||
<DueDate value={dueDate} isCompleted={isDueDateCompleted} size="tiny" />
|
||||
</span>
|
||||
)}
|
||||
{stopwatch && (
|
||||
@@ -221,6 +222,7 @@ Card.propTypes = {
|
||||
index: PropTypes.number.isRequired,
|
||||
name: PropTypes.string.isRequired,
|
||||
dueDate: PropTypes.instanceOf(Date),
|
||||
isDueDateCompleted: PropTypes.bool,
|
||||
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||
coverUrl: PropTypes.string,
|
||||
boardId: PropTypes.string.isRequired,
|
||||
@@ -255,6 +257,7 @@ Card.propTypes = {
|
||||
|
||||
Card.defaultProps = {
|
||||
dueDate: undefined,
|
||||
isDueDateCompleted: undefined,
|
||||
stopwatch: undefined,
|
||||
coverUrl: undefined,
|
||||
};
|
||||
|
||||
@@ -21,6 +21,14 @@
|
||||
background: #ebeef0;
|
||||
color: #516b7a;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
&:focus,
|
||||
&:active {
|
||||
background: #ebeef0;
|
||||
color: #516b7a;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.attachment {
|
||||
@@ -55,6 +63,12 @@
|
||||
box-shadow: 0 1px 0 #ccc;
|
||||
position: relative;
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
.target {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: #f5f6f7;
|
||||
border-bottom-color: rgba(9, 30, 66, 0.25);
|
||||
|
||||
@@ -2,7 +2,7 @@ import React, { useCallback, useRef, useState } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import classNames from 'classnames';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Button, Grid, Icon, Modal } from 'semantic-ui-react';
|
||||
import { Button, Checkbox, Grid, Icon, Modal } from 'semantic-ui-react';
|
||||
import { usePopup } from '../../lib/popup';
|
||||
import { Markdown } from '../../lib/custom-ui';
|
||||
|
||||
@@ -32,6 +32,7 @@ const CardModal = React.memo(
|
||||
name,
|
||||
description,
|
||||
dueDate,
|
||||
isDueDateCompleted,
|
||||
stopwatch,
|
||||
isSubscribed,
|
||||
isActivitiesFetching,
|
||||
@@ -118,6 +119,12 @@ const CardModal = React.memo(
|
||||
[onUpdate],
|
||||
);
|
||||
|
||||
const handleDueDateCompletionChange = useCallback(() => {
|
||||
onUpdate({
|
||||
isDueDateCompleted: !isDueDateCompleted,
|
||||
});
|
||||
}, [isDueDateCompleted, onUpdate]);
|
||||
|
||||
const handleStopwatchUpdate = useCallback(
|
||||
(newStopwatch) => {
|
||||
onUpdate({
|
||||
@@ -300,13 +307,24 @@ const CardModal = React.memo(
|
||||
context: 'title',
|
||||
})}
|
||||
</div>
|
||||
<span className={styles.attachment}>
|
||||
<span className={classNames(styles.attachment, styles.attachmentDueDate)}>
|
||||
{canEdit ? (
|
||||
<DueDateEditPopup defaultValue={dueDate} onUpdate={handleDueDateUpdate}>
|
||||
<DueDate value={dueDate} />
|
||||
</DueDateEditPopup>
|
||||
<>
|
||||
<Checkbox
|
||||
checked={isDueDateCompleted}
|
||||
disabled={!canEdit}
|
||||
onChange={handleDueDateCompletionChange}
|
||||
/>
|
||||
<DueDateEditPopup defaultValue={dueDate} onUpdate={handleDueDateUpdate}>
|
||||
<DueDate
|
||||
withStatusIcon
|
||||
value={dueDate}
|
||||
isCompleted={isDueDateCompleted}
|
||||
/>
|
||||
</DueDateEditPopup>
|
||||
</>
|
||||
) : (
|
||||
<DueDate value={dueDate} />
|
||||
<DueDate withStatusIcon value={dueDate} isCompleted={isDueDateCompleted} />
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
@@ -515,14 +533,19 @@ const CardModal = React.memo(
|
||||
<Icon name="copy outline" className={styles.actionIcon} />
|
||||
{t('action.duplicate')}
|
||||
</Button>
|
||||
<Button fluid className={styles.actionButton} onClick={handleCopyLinkClick}>
|
||||
<Icon name={isLinkCopied ? 'linkify' : 'unlink'} className={styles.actionIcon} />
|
||||
{isLinkCopied
|
||||
? t('common.linkIsCopied')
|
||||
: t('action.copyLink', {
|
||||
context: 'title',
|
||||
})}
|
||||
</Button>
|
||||
{window.isSecureContext && (
|
||||
<Button fluid className={styles.actionButton} onClick={handleCopyLinkClick}>
|
||||
<Icon
|
||||
name={isLinkCopied ? 'linkify' : 'unlink'}
|
||||
className={styles.actionIcon}
|
||||
/>
|
||||
{isLinkCopied
|
||||
? t('common.linkIsCopied')
|
||||
: t('action.copyLink', {
|
||||
context: 'title',
|
||||
})}
|
||||
</Button>
|
||||
)}
|
||||
<DeletePopup
|
||||
title="common.deleteCard"
|
||||
content="common.areYouSureYouWantToDeleteThisCard"
|
||||
@@ -557,6 +580,7 @@ CardModal.propTypes = {
|
||||
name: PropTypes.string.isRequired,
|
||||
description: PropTypes.string,
|
||||
dueDate: PropTypes.instanceOf(Date),
|
||||
isDueDateCompleted: PropTypes.bool,
|
||||
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||
isSubscribed: PropTypes.bool.isRequired,
|
||||
isActivitiesFetching: PropTypes.bool.isRequired,
|
||||
@@ -611,6 +635,7 @@ CardModal.propTypes = {
|
||||
CardModal.defaultProps = {
|
||||
description: undefined,
|
||||
dueDate: undefined,
|
||||
isDueDateCompleted: false,
|
||||
stopwatch: undefined,
|
||||
};
|
||||
|
||||
|
||||
@@ -25,6 +25,15 @@
|
||||
|
||||
.actions {
|
||||
margin-bottom: 24px;
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 425px) {
|
||||
padding: 0;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.actionsTitle {
|
||||
@@ -49,6 +58,12 @@
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.attachmentDueDate {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.attachments {
|
||||
display: inline-block;
|
||||
margin: 0 8px 8px 0;
|
||||
@@ -62,6 +77,11 @@
|
||||
|
||||
.contentPadding {
|
||||
padding: 8px 8px 0 16px;
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
padding-right: 16px;
|
||||
width: 100% !important;
|
||||
}
|
||||
}
|
||||
|
||||
.cursorPointer {
|
||||
@@ -154,6 +174,11 @@
|
||||
|
||||
.modalPadding {
|
||||
padding: 0px;
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
display: flex;
|
||||
flex-flow: column nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
.moduleHeader {
|
||||
@@ -184,6 +209,15 @@
|
||||
|
||||
.sidebarPadding {
|
||||
padding: 8px 16px 0 8px;
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
align-items: flex-start;
|
||||
display: flex;
|
||||
flex-flow: row wrap;
|
||||
gap: 10px;
|
||||
padding-left: 16px;
|
||||
width: 100% !important;
|
||||
}
|
||||
}
|
||||
|
||||
.text {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
border-radius: 4px;
|
||||
bottom: 20px;
|
||||
box-shadow: #b04632 0 1px 0;
|
||||
max-width: calc(100% - 40px);
|
||||
padding: 12px 18px;
|
||||
position: fixed;
|
||||
right: 20px;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import upperFirst from 'lodash/upperFirst';
|
||||
import React from 'react';
|
||||
import React, { useEffect, useRef } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import classNames from 'classnames';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Icon } from 'semantic-ui-react';
|
||||
import { useForceUpdate } from '../../lib/hooks';
|
||||
|
||||
import getDateFormat from '../../utils/get-date-format';
|
||||
|
||||
@@ -14,6 +16,12 @@ const SIZES = {
|
||||
MEDIUM: 'medium',
|
||||
};
|
||||
|
||||
const STATUSES = {
|
||||
DUE_SOON: 'dueSoon',
|
||||
OVERDUE: 'overdue',
|
||||
COMPLETED: 'completed',
|
||||
};
|
||||
|
||||
const LONG_DATE_FORMAT_BY_SIZE = {
|
||||
tiny: 'longDate',
|
||||
small: 'longDate',
|
||||
@@ -26,8 +34,47 @@ const FULL_DATE_FORMAT_BY_SIZE = {
|
||||
medium: 'fullDateTime',
|
||||
};
|
||||
|
||||
const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
||||
const STATUS_ICON_PROPS_BY_STATUS = {
|
||||
[STATUSES.DUE_SOON]: {
|
||||
name: 'hourglass half',
|
||||
color: 'orange',
|
||||
},
|
||||
[STATUSES.OVERDUE]: {
|
||||
name: 'hourglass end',
|
||||
color: 'red',
|
||||
},
|
||||
[STATUSES.COMPLETED]: {
|
||||
name: 'checkmark',
|
||||
color: 'green',
|
||||
},
|
||||
};
|
||||
|
||||
const getStatus = (dateTime, isCompleted) => {
|
||||
if (isCompleted) {
|
||||
return STATUSES.COMPLETED;
|
||||
}
|
||||
|
||||
const secondsLeft = Math.floor((dateTime.getTime() - new Date().getTime()) / 1000);
|
||||
|
||||
if (secondsLeft <= 0) {
|
||||
return STATUSES.OVERDUE;
|
||||
}
|
||||
|
||||
if (secondsLeft <= 24 * 60 * 60) {
|
||||
return STATUSES.DUE_SOON;
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
const DueDate = React.memo(({ value, size, isCompleted, isDisabled, withStatusIcon, onClick }) => {
|
||||
const [t] = useTranslation();
|
||||
const forceUpdate = useForceUpdate();
|
||||
|
||||
const statusRef = useRef(null);
|
||||
statusRef.current = getStatus(value, isCompleted);
|
||||
|
||||
const intervalRef = useRef(null);
|
||||
|
||||
const dateFormat = getDateFormat(
|
||||
value,
|
||||
@@ -35,11 +82,34 @@ const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
||||
FULL_DATE_FORMAT_BY_SIZE[size],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if ([null, STATUSES.DUE_SOON].includes(statusRef.current)) {
|
||||
intervalRef.current = setInterval(() => {
|
||||
const status = getStatus(value, isCompleted);
|
||||
|
||||
if (status !== statusRef.current) {
|
||||
forceUpdate();
|
||||
}
|
||||
|
||||
if (status === STATUSES.OVERDUE) {
|
||||
clearInterval(intervalRef.current);
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
return () => {
|
||||
if (intervalRef.current) {
|
||||
clearInterval(intervalRef.current);
|
||||
}
|
||||
};
|
||||
}, [value, isCompleted, forceUpdate]);
|
||||
|
||||
const contentNode = (
|
||||
<span
|
||||
className={classNames(
|
||||
styles.wrapper,
|
||||
styles[`wrapper${upperFirst(size)}`],
|
||||
!withStatusIcon && statusRef.current && styles[`wrapper${upperFirst(statusRef.current)}`],
|
||||
onClick && styles.wrapperHoverable,
|
||||
)}
|
||||
>
|
||||
@@ -47,6 +117,10 @@ const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
||||
value,
|
||||
postProcess: 'formatDate',
|
||||
})}
|
||||
{withStatusIcon && statusRef.current && (
|
||||
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||
<Icon {...STATUS_ICON_PROPS_BY_STATUS[statusRef.current]} className={styles.statusIcon} />
|
||||
)}
|
||||
</span>
|
||||
);
|
||||
|
||||
@@ -62,14 +136,19 @@ const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
||||
DueDate.propTypes = {
|
||||
value: PropTypes.instanceOf(Date).isRequired,
|
||||
size: PropTypes.oneOf(Object.values(SIZES)),
|
||||
isCompleted: PropTypes.bool.isRequired,
|
||||
isDisabled: PropTypes.bool,
|
||||
withStatusIcon: PropTypes.bool,
|
||||
onClick: PropTypes.func,
|
||||
onCompletionToggle: PropTypes.func,
|
||||
};
|
||||
|
||||
DueDate.defaultProps = {
|
||||
size: SIZES.MEDIUM,
|
||||
isDisabled: false,
|
||||
withStatusIcon: false,
|
||||
onClick: undefined,
|
||||
onCompletionToggle: undefined,
|
||||
};
|
||||
|
||||
export default DueDate;
|
||||
|
||||
@@ -8,16 +8,17 @@
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.statusIcon {
|
||||
line-height: 1;
|
||||
margin: 0 0 0 8px;
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
background: #dce0e4;
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
color: #6a808b;
|
||||
display: inline-block;
|
||||
outline: none;
|
||||
text-align: left;
|
||||
transition: background 0.3s ease;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.wrapperHoverable:hover {
|
||||
@@ -43,4 +44,21 @@
|
||||
line-height: 20px;
|
||||
padding: 6px 12px;
|
||||
}
|
||||
|
||||
/* Statuses */
|
||||
|
||||
.wrapperDueSoon {
|
||||
background: #f2711c;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.wrapperOverdue {
|
||||
background: #db2828;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.wrapperCompleted {
|
||||
background: #21ba45;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
:global(#app) {
|
||||
.wrapper {
|
||||
max-width: 100vw;
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
z-index: 1;
|
||||
|
||||
@@ -87,7 +87,12 @@
|
||||
}
|
||||
|
||||
.userName {
|
||||
display: none;
|
||||
margin-right: 10px;
|
||||
|
||||
@media only screen and (min-width: 797px) {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
|
||||
@@ -17,7 +17,7 @@ const SIZES = {
|
||||
|
||||
const Label = React.memo(({ name, color, size, isDisabled, onClick }) => {
|
||||
const contentNode = (
|
||||
<div
|
||||
<span
|
||||
title={name}
|
||||
className={classNames(
|
||||
styles.wrapper,
|
||||
@@ -28,7 +28,7 @@ const Label = React.memo(({ name, color, size, isDisabled, onClick }) => {
|
||||
)}
|
||||
>
|
||||
{name || '\u00A0'}
|
||||
</div>
|
||||
</span>
|
||||
);
|
||||
|
||||
return onClick ? (
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
.wrapper {
|
||||
border-radius: 3px;
|
||||
box-sizing: border-box;
|
||||
color: #fff;
|
||||
display: inline-block;
|
||||
font-weight: 400;
|
||||
outline: none;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
|
||||
vertical-align: top;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.wrapperNameless{
|
||||
.wrapperNameless {
|
||||
width: 40px;
|
||||
}
|
||||
|
||||
|
||||
@@ -80,6 +80,12 @@
|
||||
&:hover .target {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
.target {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.headerEditable {
|
||||
@@ -103,6 +109,14 @@
|
||||
background: rgba(9, 30, 66, 0.13);
|
||||
color: #516b7a;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
&:focus,
|
||||
&:active {
|
||||
background: rgba(9, 30, 66, 0.13);
|
||||
color: #516b7a;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.headerName {
|
||||
|
||||
@@ -11,6 +11,10 @@
|
||||
vertical-align: top;
|
||||
width: 36px;
|
||||
|
||||
@media only screen and (max-width: 797px) {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: rgba(0, 0, 0, 0.32);
|
||||
}
|
||||
|
||||
@@ -10,13 +10,10 @@
|
||||
|
||||
.wrapper {
|
||||
background: #dce0e4;
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
color: #6a808b;
|
||||
display: inline-block;
|
||||
font-variant-numeric: tabular-nums;
|
||||
outline: none;
|
||||
text-align: left;
|
||||
transition: background 0.3s ease;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
@@ -14,12 +14,10 @@
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
color: #fff;
|
||||
display: inline-block;
|
||||
line-height: 1;
|
||||
outline: none;
|
||||
text-align: center;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import React from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Image, Tab } from 'semantic-ui-react';
|
||||
|
||||
import Config from '../../constants/Config';
|
||||
import version from '../../version';
|
||||
|
||||
import logo from '../../assets/images/logo.png';
|
||||
|
||||
@@ -15,7 +15,7 @@ const AboutPane = React.memo(() => {
|
||||
<Tab.Pane attached={false} className={styles.wrapper}>
|
||||
<Image centered src={logo} size="large" />
|
||||
<div className={styles.version}>
|
||||
{t('common.version')} {Config.VERSION}
|
||||
{t('common.version')} {version}
|
||||
</div>
|
||||
</Tab.Pane>
|
||||
);
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
const VERSION = process.env.REACT_APP_VERSION;
|
||||
|
||||
const { BASE_URL } = window;
|
||||
const BASE_PATH = BASE_URL.replace(/^.*\/\/[^/]*(.*)[^?#]*.*$/, '$1');
|
||||
|
||||
@@ -18,7 +16,6 @@ const POSITION_GAP = 65535;
|
||||
const ACTIVITIES_LIMIT = 50;
|
||||
|
||||
export default {
|
||||
VERSION,
|
||||
BASE_PATH,
|
||||
SERVER_BASE_URL,
|
||||
SERVER_BASE_PATH,
|
||||
|
||||
@@ -20,10 +20,8 @@ const makeMapStateToProps = () => {
|
||||
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
||||
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||
|
||||
const { name, dueDate, stopwatch, coverUrl, boardId, listId, isPersisted } = selectCardById(
|
||||
state,
|
||||
id,
|
||||
);
|
||||
const { name, dueDate, isDueDateCompleted, stopwatch, coverUrl, boardId, listId, isPersisted } =
|
||||
selectCardById(state, id);
|
||||
|
||||
const users = selectUsersByCardId(state, id);
|
||||
const labels = selectLabelsByCardId(state, id);
|
||||
@@ -38,6 +36,7 @@ const makeMapStateToProps = () => {
|
||||
index,
|
||||
name,
|
||||
dueDate,
|
||||
isDueDateCompleted,
|
||||
stopwatch,
|
||||
coverUrl,
|
||||
boardId,
|
||||
|
||||
@@ -21,6 +21,7 @@ const mapStateToProps = (state) => {
|
||||
name,
|
||||
description,
|
||||
dueDate,
|
||||
isDueDateCompleted,
|
||||
stopwatch,
|
||||
isSubscribed,
|
||||
isActivitiesFetching,
|
||||
@@ -49,6 +50,7 @@ const mapStateToProps = (state) => {
|
||||
name,
|
||||
description,
|
||||
dueDate,
|
||||
isDueDateCompleted,
|
||||
stopwatch,
|
||||
isSubscribed,
|
||||
isActivitiesFetching,
|
||||
|
||||
@@ -15,10 +15,12 @@ export default {
|
||||
|
||||
translation: {
|
||||
common: {
|
||||
aboutPlanka: 'À propos de Planka',
|
||||
account: 'Compte',
|
||||
actions: 'Actions',
|
||||
addAttachment_title: 'Ajouter une pièce jointe',
|
||||
addComment: 'Ajouter un commentaire',
|
||||
addManager_title: 'Ajouter un manager',
|
||||
addMember_title: 'Ajouter un membre',
|
||||
addUser_title: 'Ajouter un utilisateur',
|
||||
administrator: 'Administrateur',
|
||||
@@ -26,32 +28,43 @@ export default {
|
||||
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||
'Toutes les modifications seront automatiquement enregistrées<br />une fois la connexion rétablie.',
|
||||
areYouSureYouWantToDeleteThisAttachment: 'Voulez-vous vraiment supprimer cette pièce jointe?',
|
||||
areYouSureYouWantToDeleteThisBoard: 'Êtes-vous sûr de vouloir supprimer ce forum?',
|
||||
areYouSureYouWantToDeleteThisBoard: 'Êtes-vous sûr de vouloir supprimer ce tableau?',
|
||||
areYouSureYouWantToDeleteThisCard: 'Voulez-vous vraiment supprimer cette carte?',
|
||||
areYouSureYouWantToDeleteThisComment: 'Êtes-vous sûr de vouloir supprimer ce commentaire?',
|
||||
areYouSureYouWantToDeleteThisLabel: 'Voulez-vous vraiment supprimer ce libellé?',
|
||||
areYouSureYouWantToDeleteThisLabel: 'Voulez-vous vraiment supprimer cette étiquette?',
|
||||
areYouSureYouWantToDeleteThisList: 'Êtes-vous sûr de vouloir supprimer cette liste?',
|
||||
areYouSureYouWantToDeleteThisProject: 'Êtes-vous sûr de vouloir supprimer ce projet?',
|
||||
areYouSureYouWantToDeleteThisTask: 'Êtes-vous sûr de vouloir supprimer cette tâche?',
|
||||
areYouSureYouWantToDeleteThisUser: 'Êtes-vous sûr de vouloir supprimer cet utilisateur?',
|
||||
areYouSureYouWantToLeaveBoard: 'Êtes-vous sûr de vouloir quitter ce tableau ?',
|
||||
areYouSureYouWantToLeaveProject: 'Êtes-vous sûr de vouloir quitter ce projet ?',
|
||||
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||
'Êtes-vous sûr de vouloir supprimer ce manager du projet ?',
|
||||
areYouSureYouWantToRemoveThisMemberFromProject:
|
||||
'Êtes-vous sûr de vouloir supprimer ce membre du projet?',
|
||||
attachment: 'Attachement',
|
||||
attachment: 'Pièce jointe',
|
||||
attachments: 'Pièces jointes',
|
||||
authentication: 'Authentification',
|
||||
background: 'Arrière-plan',
|
||||
board: 'Tableau',
|
||||
boardNotFound_title: 'Carte non trouvée',
|
||||
canComment: 'Peut commenter',
|
||||
canEditContentOfBoard: 'Peut éditer le contenu du tableau.',
|
||||
canOnlyViewBoard: 'Peut uniquement voir le tableau.',
|
||||
cardActions_title: 'Actions sur la carte',
|
||||
cardNotFound_title: 'Carte non trouvée',
|
||||
cardOrActionAreDeleted: "La carte ou l'action sont supprimées.",
|
||||
color: 'Couleur',
|
||||
copy_inline: 'copie',
|
||||
createBoard_title: 'Créer un tableau',
|
||||
createLabel_title: 'Créer une étiquette',
|
||||
createNewOneOrSelectExistingOne: 'Créez-en un nouveau ou sélectionnez<br />un existant.',
|
||||
createProject_title: 'Créer un projet',
|
||||
createTextFile_title: 'Créer un fichier texte',
|
||||
currentPassword: 'Mot de passe actuel',
|
||||
dangerZone_title: 'Zone dangereuse',
|
||||
date: 'Date',
|
||||
dueDate: "Date d'échéance",
|
||||
dueDate_title: "Date d'échéance",
|
||||
deleteAttachment_title: 'Supprimer la pièce jointe',
|
||||
deleteBoard_title: 'Supprimer le tableau',
|
||||
@@ -63,67 +76,89 @@ export default {
|
||||
deleteTask_title: 'Supprimer la tâche',
|
||||
deleteUser_title: "Supprimer l'utilisateur",
|
||||
description: 'Description',
|
||||
detectAutomatically: 'Détecter automatiquement',
|
||||
dropFileToUpload: 'Déposer le fichier à télécharger',
|
||||
editor: 'Éditeur',
|
||||
editAttachment_title: 'Modifier la pièce jointe',
|
||||
editAvatar_title: 'Modifier Avatar',
|
||||
editBoard_title: 'Modifier le tableau',
|
||||
editDueDate_title: "Modifier la date d'échéance",
|
||||
editEmail_title: "Modifier l'e-mail",
|
||||
editEmail_title: "Modifier l'email",
|
||||
editInformation_title: 'Modifier les informations',
|
||||
editLabel_title: "Modifier l'étiquette",
|
||||
editPassword_title: 'Modifier le mot de passe',
|
||||
editPermissions_title: 'Modifier les permissions',
|
||||
editStopwatch_title: 'Modifier la minuterie',
|
||||
editUsername_title: "Modifier le nom d'utilisateur",
|
||||
email: 'E-mail',
|
||||
emailAlreadyInUse: 'Email déjà utilisé',
|
||||
enterCardTitle: 'Entrer le titre de la carte...',
|
||||
enterDescription: 'Entrez la description...',
|
||||
enterFilename: 'Entrez le nom du fichier',
|
||||
enterListTitle: 'Entrer le titre de la liste...',
|
||||
enterCardTitle: 'Saisir le titre de la carte... [Ctrl+Enter] pour ouvrir automatiquement',
|
||||
enterDescription: 'Saisir la description...',
|
||||
enterFilename: 'Saisir le nom du fichier',
|
||||
enterListTitle: 'Saisie le titre de la liste...',
|
||||
enterProjectTitle: 'Saisir le titre du projet',
|
||||
enterTaskDescription: 'Saisir la description de la tâche...',
|
||||
filterByLabels_title: 'Filtrer par libellés',
|
||||
filterByLabels_title: 'Filtrer par étiquettes',
|
||||
filterByMembers_title: 'Filtrer par membres',
|
||||
fromComputer_title: "Depuis l'ordinateur",
|
||||
hours: 'Les heures',
|
||||
fromTrello: 'Depuis Trello',
|
||||
general: 'Général',
|
||||
hours: 'Heures',
|
||||
importBoard_title: 'Importer un tableau',
|
||||
invalidCurrentPassword: 'Mot de passe actuel invalide',
|
||||
labels: 'Étiquettes',
|
||||
language: 'Langue',
|
||||
leaveBoard_title: 'Quitter le tableau',
|
||||
leaveProject_title: 'Quitter le projet',
|
||||
linkIsCopied: 'Le lien est copié',
|
||||
list: 'Lister',
|
||||
listActions_title: 'Liste des actions',
|
||||
managers: 'Managers',
|
||||
managerActions_title: 'Actions des managers',
|
||||
members: 'Membres',
|
||||
memberActions_title: 'Actions des membres',
|
||||
minutes: 'Minutes',
|
||||
moveCard_title: 'Déplacer la carte',
|
||||
name: 'Nom',
|
||||
newEmail: 'Nouveau courriel',
|
||||
newestFirst: 'Le plus récent en premier',
|
||||
newEmail: 'Nouveau email',
|
||||
newPassword: 'Nouveau mot de passe',
|
||||
newUsername: "Nouveau nom d'utilisateur",
|
||||
noConnectionToServer: 'Pas de connexion au serveur',
|
||||
noBoards: 'Pas de planches',
|
||||
noBoards: 'Pas de tableau',
|
||||
noLists: 'Pas de listes',
|
||||
noProjects: 'Pas de projets',
|
||||
notifications: 'Notifications',
|
||||
noUnreadNotifications: 'Aucune notification non lue.',
|
||||
openBoard_title: 'Open Board',
|
||||
oldestFirst: 'Le plus ancien en premier',
|
||||
openBoard_title: 'Ouvrir le tableau',
|
||||
optional_inline: 'optionnel',
|
||||
organization: 'Organisation',
|
||||
phone: 'Téléphone',
|
||||
preferences: 'Préférences',
|
||||
pressPasteShortcutToAddAttachmentFromClipboard: 'Conseil',
|
||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||
'Conseil: appuyer sur Ctrl-V (Cmd-V sur Mac) pour ajouter une pièce jointe depuis le presse-papiers',
|
||||
project: 'Projet',
|
||||
projectNotFound_title: 'Projet introuvable',
|
||||
removeManager_title: 'Supprimer le manager',
|
||||
removeMember_title: 'Supprimer le membre',
|
||||
searchLabels: 'Chercher une étiquette...',
|
||||
searchMembers: 'Chercher un membre...',
|
||||
searchUsers: 'Chercher un utilisateur...',
|
||||
searchCards: 'Chercher une carte...',
|
||||
seconds: 'Secondes',
|
||||
selectBoard: 'Sélectionner une carte',
|
||||
selectBoard: 'Sélectionner un tableau',
|
||||
selectList: 'Sélectionner une liste',
|
||||
selectPermissions_title: 'Sélectionner les permissions',
|
||||
selectProject: 'Sélectionner un projet',
|
||||
settings: 'Réglages',
|
||||
sortList_title: 'Trier la liste',
|
||||
stopwatch: 'Minuteur',
|
||||
subscribeToMyOwnCardsByDefault: 'Abonnez-vous à mes propres cartes par défaut',
|
||||
taskActions_title: 'Actions de tâche',
|
||||
tasks: 'Tâches',
|
||||
thereIsNoPreviewAvailableForThisAttachment:
|
||||
"Il n'y a pas de prévisualisation de disponible pour cette pièce jointe.",
|
||||
time: 'Temps',
|
||||
title: 'Titre',
|
||||
userActions_title: "Actions de l'utilisateur",
|
||||
@@ -137,6 +172,8 @@ export default {
|
||||
username: "Nom d'utilisateur",
|
||||
usernameAlreadyInUse: "Nom d'utilisateur déjà utilisé",
|
||||
users: 'Utilisateurs',
|
||||
version: 'Version',
|
||||
viewer: 'Spectateur',
|
||||
writeComment: 'Écrire un commentaire...',
|
||||
},
|
||||
|
||||
@@ -148,10 +185,12 @@ export default {
|
||||
addCard_title: 'Ajouter une carte',
|
||||
addComment: 'Ajouter un commentaire',
|
||||
addList: 'Ajouter la liste',
|
||||
addMember: 'Ajouter un membre',
|
||||
addMoreDetailedDescription: 'Ajouter une description plus détaillée',
|
||||
addTask: 'Ajouter une tâche',
|
||||
addToCard: 'Ajouter à la carte',
|
||||
addUser: 'Ajouter un utilisateur',
|
||||
copyLink_title: 'Copier le lien',
|
||||
createBoard: 'Créer un tableau',
|
||||
createFile: 'Créer un fichier',
|
||||
createLabel: 'Créer une étiquette',
|
||||
@@ -174,14 +213,21 @@ export default {
|
||||
deleteTask_title: 'Supprimer la tâche',
|
||||
deleteUser: "Supprimer l'utilisateur",
|
||||
duplicate: 'Dupliquer',
|
||||
duplicateCard_title: 'Dupliquer la carte',
|
||||
edit: 'Modifier',
|
||||
editDueDate_title: "Modifier la date d'échéance",
|
||||
editDescription_title: 'Éditer la description',
|
||||
editEmail_title: "Modifier l'e-mail",
|
||||
editDescription_title: 'Modifier la description',
|
||||
editEmail_title: "Modifier l'email",
|
||||
editInformation_title: 'Modifier les informations',
|
||||
editPassword_title: 'Modifier le mot de passe',
|
||||
editPermissions: 'Modifier les permissions',
|
||||
editStopwatch_title: 'Modifier la minuterie',
|
||||
editTitle_title: 'Modifier le titre',
|
||||
editUsername_title: "Modifier le nom d'utilisateur",
|
||||
hideDetails: 'Cacher les détails',
|
||||
import: 'Importer',
|
||||
leaveBoard: 'Quitter le tableau',
|
||||
leaveProject: 'Quitter le projet',
|
||||
logOut_title: 'Se déconnecter',
|
||||
makeCover_title: 'Faire la jaquette',
|
||||
move: 'Déplacer',
|
||||
@@ -189,11 +235,15 @@ export default {
|
||||
remove: 'Supprimer',
|
||||
removeBackground: "Supprimer l'arrière-plan",
|
||||
removeCover_title: 'Supprimer la jaquette',
|
||||
removeFromBoard: 'Supprimer le tableau',
|
||||
removeFromProject: 'Supprimer du projet',
|
||||
removeManager: 'Supprimer le manager',
|
||||
removeMember: 'Supprimer le membre',
|
||||
save: 'Sauvegarder',
|
||||
showAllAttachments: 'Afficher toutes les pièces jointes ({{hidden}} masquées)',
|
||||
showDetails: 'Afficher les détails',
|
||||
showFewerAttachments: 'Afficher moins de pièces jointes',
|
||||
sortList_title: 'Trier la liste',
|
||||
start: 'Début',
|
||||
stop: 'Arrêter',
|
||||
subscribe: "S'abonner",
|
||||
|
||||
@@ -11,10 +11,12 @@ export default {
|
||||
projectManagement: 'Gestion de projet',
|
||||
serverConnectionFailed: 'Connection au serveur échouée',
|
||||
unknownError: 'Erreur inconnue, réessayez plus tard',
|
||||
useSingleSignOn: "Utiliser l'authentification unique",
|
||||
},
|
||||
|
||||
action: {
|
||||
logIn: 'Se connecter',
|
||||
logInWithSSO: "Se connecter avec l'authentification unique",
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -22,6 +22,7 @@ import trTR from './tr-TR';
|
||||
import ukUA from './uk-UA';
|
||||
import uzUZ from './uz-UZ';
|
||||
import zhCN from './zh-CN';
|
||||
import zhTW from './zh-TW';
|
||||
|
||||
const locales = [
|
||||
bgBG,
|
||||
@@ -48,6 +49,7 @@ const locales = [
|
||||
ukUA,
|
||||
uzUZ,
|
||||
zhCN,
|
||||
zhTW,
|
||||
];
|
||||
|
||||
export default locales;
|
||||
|
||||
@@ -55,7 +55,7 @@ export default {
|
||||
cardNotFound: 'Карточка не найдена',
|
||||
cardOrActionAreDeleted: 'Карточка или действие удалены.',
|
||||
color: 'Цвет',
|
||||
connectionRestored: 'Соединение восстановлено',
|
||||
copy_inline: 'копировать',
|
||||
createBoard: 'Создание доски',
|
||||
createLabel: 'Создание метки',
|
||||
createNewOneOrSelectExistingOne: 'Создайте новую или выберите<br />уже существующую.',
|
||||
@@ -65,6 +65,7 @@ export default {
|
||||
dangerZone_title: 'Опасная зона',
|
||||
date: 'Дата',
|
||||
dueDate: 'Срок',
|
||||
dueDate_title: 'Срок исполнения',
|
||||
deleteAttachment: 'Удаление вложения',
|
||||
deleteBoard: 'Удаление доски',
|
||||
deleteCard: 'Удаление карточки',
|
||||
@@ -80,9 +81,8 @@ export default {
|
||||
editor: 'Редактор',
|
||||
editAttachment: 'Изменение вложения',
|
||||
editAvatar: 'Изменение аватара',
|
||||
editBoard: 'Изменение доски',
|
||||
editBackground: 'Изменение фона',
|
||||
editDueDate: 'Изменение срока',
|
||||
editBoard_title: 'Изменение доски',
|
||||
editDueDate_title: 'Изменить срок выполнения',
|
||||
editEmail: 'Изменение e-mail',
|
||||
editInformation: 'Изменение информации',
|
||||
editLabel: 'Изменение метки',
|
||||
@@ -90,10 +90,10 @@ export default {
|
||||
editPermissions: 'Редактирование разрешений',
|
||||
editStopwatch: 'Изменение секундомера',
|
||||
editTitle: 'Изменение названия',
|
||||
editUsername: 'Изменение имени пользователя',
|
||||
editUsername_title: 'Изменение имени пользователя',
|
||||
email: 'E-mail',
|
||||
emailAlreadyInUse: 'E-mail уже занят',
|
||||
enterCardTitle: 'Введите заголовок для этой карточки...',
|
||||
enterCardTitle: 'Введите заголовок для этой карточки... [Ctrl+Enter] для применения',
|
||||
enterDescription: 'Введите описание...',
|
||||
enterFilename: 'Введите название файла',
|
||||
enterListTitle: 'Введите заголовок списка...',
|
||||
@@ -110,14 +110,18 @@ export default {
|
||||
labels: 'Метки',
|
||||
language: 'Язык',
|
||||
leaveBoard: 'Покинуть доску',
|
||||
leaveProject: 'Покинуть проект',
|
||||
leaveProject_title: 'Покинуть проект',
|
||||
linkIsCopied: 'Ссылка скопирована',
|
||||
list: 'Список',
|
||||
listActions: 'Действия со списком',
|
||||
listActions_title: 'Действия со списком',
|
||||
managers: 'Менеджеры',
|
||||
managerActions_title: 'Действия Менеджера',
|
||||
members: 'Участники',
|
||||
memberActions_title: 'Действия участников',
|
||||
minutes: 'Минуты',
|
||||
moveCard: 'Перемещение карточки',
|
||||
moveCard_title: 'Перемещение карточки',
|
||||
name: 'Имя',
|
||||
newestFirst: 'Новые первые',
|
||||
newEmail: 'Новый e-mail',
|
||||
newPassword: 'Новый пароль',
|
||||
newUsername: 'Новое имя пользователя',
|
||||
@@ -127,7 +131,8 @@ export default {
|
||||
noProjects: 'Проектов нет',
|
||||
notifications: 'Уведомления',
|
||||
noUnreadNotifications: 'Уведомлений нет.',
|
||||
openBoard: 'Откройте доску',
|
||||
oldestFirst: 'Старые первые',
|
||||
openBoard_title: 'Откройте доску',
|
||||
optional_inline: 'необязательно',
|
||||
organization: 'Организация',
|
||||
phone: 'Телефон',
|
||||
@@ -135,10 +140,9 @@ export default {
|
||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||
'Совет: нажмите Ctrl-V (Cmd-V на Mac), чтобы добавить вложение из буфера обмена.',
|
||||
project: 'Проект',
|
||||
projectActions: 'Действия с проектом',
|
||||
projectNotFound: 'Проект не найден',
|
||||
removeManager: 'Удалить менеджера',
|
||||
removeMember: 'Удаление участника',
|
||||
projectNotFound_title: 'Проект не найден',
|
||||
removeManager_title: 'Удалить менеджера',
|
||||
removeMember_title: 'Удаление участника',
|
||||
searchLabels: 'Поиск меток...',
|
||||
searchMembers: 'Поиск участников...',
|
||||
searchUsers: 'Поиск пользователей...',
|
||||
@@ -149,14 +153,15 @@ export default {
|
||||
selectPermissions: 'Выбор разрешений',
|
||||
selectProject: 'Выберите проект',
|
||||
settings: 'Настройки',
|
||||
sortList_title: 'Сортировка списка',
|
||||
stopwatch: 'Секундомер',
|
||||
subscribeToMyOwnCardsByDefault: 'По умолчанию подписываться на мои собственные карточки',
|
||||
taskActions: 'Действия с задачей',
|
||||
taskActions_title: 'Действия по задаче',
|
||||
tasks: 'Задачи',
|
||||
thereIsNoPreviewAvailableForThisAttachment: 'Предпросмотр для этого вложения недоступен.',
|
||||
time: 'Время',
|
||||
title: 'Название',
|
||||
userActions: 'Действия с пользователем',
|
||||
userActions_title: 'Действия с пользователем',
|
||||
userAddedThisCardToList: '<0>{{user}}</0><1> добавил(а) эту карточку в {{list}}</1>',
|
||||
userLeftNewCommentToCard: '{{user}} оставил(а) комментарий «{{comment}}» к <2>{{card}}</2>',
|
||||
userMovedCardFromListToList:
|
||||
@@ -175,7 +180,7 @@ export default {
|
||||
addAnotherCard: 'Добавить еще одну карточку',
|
||||
addAnotherList: 'Добавить еще один список',
|
||||
addAnotherTask: 'Добавить еще одну задачу',
|
||||
addCard: 'Добавить карточку',
|
||||
addCard_title: 'Добавить карточку',
|
||||
addComment: 'Добавить комментарий',
|
||||
addList: 'Добавить список',
|
||||
addMember: 'Добавить участника',
|
||||
@@ -183,6 +188,7 @@ export default {
|
||||
addTask: 'Добавить задачу',
|
||||
addToCard: 'Добавить на карточку',
|
||||
addUser: 'Добавить пользователя',
|
||||
copyLink_title: 'Копировать ссылку',
|
||||
createBoard: 'Создать доску',
|
||||
createFile: 'Создать файл',
|
||||
createLabel: 'Создать метку',
|
||||
@@ -193,38 +199,41 @@ export default {
|
||||
deleteAvatar: 'Удалить аватар',
|
||||
deleteBoard: 'Удалить доску',
|
||||
deleteCard: 'Удалить карточку',
|
||||
deleteCard_title: 'Удалить карточку',
|
||||
deleteComment: 'Удалить комментарий',
|
||||
deleteImage: 'Удалить изображение',
|
||||
deleteLabel: 'Удалить метку',
|
||||
deleteList: 'Удалить список',
|
||||
deleteList_title: 'Удалить список',
|
||||
deleteProject: 'Удалить проект',
|
||||
deleteProject_title: 'Удалить проект',
|
||||
deleteTask: 'Удалить задачу',
|
||||
deleteTask_title: 'Удалить задачу',
|
||||
deleteUser: 'Удалить пользователя',
|
||||
duplicate: 'Дублировать',
|
||||
duplicateCard_title: 'Дублировать карточку',
|
||||
edit: 'Изменить',
|
||||
editBackground: 'Изменить фон',
|
||||
editDueDate: 'Изменить срок',
|
||||
editDescription: 'Изменить описание',
|
||||
editEmail: 'Изменить e-mail',
|
||||
editInformation: 'Изменить информацию',
|
||||
editPassword: 'Изменить пароль',
|
||||
editDueDate_title: 'Изменить срок',
|
||||
editDescription_title: 'Изменить описание',
|
||||
editEmail_title: 'Изменить e-mail',
|
||||
editInformation_title: 'Изменить информацию',
|
||||
editPassword_title: 'Изменить пароль',
|
||||
editPermissions: 'Изменить разрешения',
|
||||
editStopwatch: 'Изменить секундомер',
|
||||
editTask: 'Изменить задачу',
|
||||
editTitle: 'Изменить название',
|
||||
editUsername: 'Изменить имя пользователя',
|
||||
editStopwatch_title: 'Изменить секундомер',
|
||||
editTitle_title: 'Изменить название',
|
||||
editUsername_title: 'Изменить имя пользователя',
|
||||
hideDetails: 'Скрыть подробности',
|
||||
import: 'Импорт',
|
||||
leaveBoard: 'Покинуть доску',
|
||||
leaveProject: 'Покинуть проект',
|
||||
logOut: 'Выйти',
|
||||
makeCover: 'Сделать обложкой',
|
||||
logOut_title: 'Выйти',
|
||||
makeCover_title: 'Сделать обложкой',
|
||||
move: 'Переместить',
|
||||
moveCard: 'Переместить карточку',
|
||||
moveCard_title: 'Переместить карточку',
|
||||
remove: 'Убрать',
|
||||
removeBackground: 'Убрать фон',
|
||||
removeCover: 'Убрать обложку',
|
||||
removeCover_title: 'Убрать обложку',
|
||||
removeFromBoard: 'Удалить из доски',
|
||||
removeFromProject: 'Удалить из проекта',
|
||||
removeManager: 'Удалить менеджера',
|
||||
|
||||
@@ -6,15 +6,17 @@ export default {
|
||||
invalidPassword: 'Неверный пароль',
|
||||
logInToPlanka: 'Вход в Planka',
|
||||
noInternetConnection: 'Нет соединения',
|
||||
pageNotFound: 'Страница не найдена',
|
||||
pageNotFound_title: 'Страница не найдена',
|
||||
password: 'Пароль',
|
||||
projectManagement: 'Управление проектами',
|
||||
serverConnectionFailed: 'Не могу подключиться к серверу',
|
||||
unknownError: 'Что-то пошло не так, попробуйте позже',
|
||||
useSingleSignOn: 'Используйте единый вход',
|
||||
},
|
||||
|
||||
action: {
|
||||
logIn: 'Войти',
|
||||
logInWithSSO: 'Войти с помощью единого входа',
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -0,0 +1,237 @@
|
||||
import dateFns from 'date-fns/locale/zh-TW';
|
||||
|
||||
export default {
|
||||
dateFns,
|
||||
|
||||
format: {
|
||||
date: 'M/d/yyyy',
|
||||
time: 'p',
|
||||
dateTime: '$t(format:date) $t(format:time)',
|
||||
longDate: 'MMM d',
|
||||
longDateTime: "MMMM d 'at' p",
|
||||
fullDate: 'MMM d, y',
|
||||
fullDateTime: "MMMM d, y 'at' p",
|
||||
},
|
||||
|
||||
translation: {
|
||||
common: {
|
||||
aboutPlanka: '關於 Planka',
|
||||
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: '看板不存在',
|
||||
canComment: '可以評論',
|
||||
canEditContentOfBoard: '可以編輯看板內容',
|
||||
canOnlyViewBoard: '僅可查看看板',
|
||||
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: '描述',
|
||||
detectAutomatically: '自動偵測',
|
||||
dropFileToUpload: '拖放文件以上傳',
|
||||
editor: '編輯器',
|
||||
editAttachment_title: '編輯附件',
|
||||
editAvatar_title: '編輯頭像',
|
||||
editBoard_title: '編輯看板',
|
||||
editDueDate_title: '編輯截止時間',
|
||||
editEmail_title: '編輯郵箱',
|
||||
editInformation_title: '編輯信息',
|
||||
editLabel_title: '編輯標籤',
|
||||
editPassword_title: '修改密碼',
|
||||
editPermissions_title: '修改權限',
|
||||
editStopwatch_title: '修改計時',
|
||||
editUsername_title: '修改使用者名稱',
|
||||
email: '郵箱',
|
||||
emailAlreadyInUse: '郵箱已被使用',
|
||||
enterCardTitle: '輸入卡片標題...',
|
||||
enterDescription: '輸入描述...',
|
||||
enterFilename: '輸入文件名',
|
||||
enterListTitle: '輸入列表標題...',
|
||||
enterProjectTitle: '輸入專案標題',
|
||||
enterTaskDescription: '輸入任務描述...',
|
||||
filterByLabels_title: '通過標籤篩選',
|
||||
filterByMembers_title: '通過成員篩選',
|
||||
fromComputer_title: '來自電腦',
|
||||
fromTrello: '來自 Trello',
|
||||
general: '通用',
|
||||
hours: '小時',
|
||||
importBoard_title: '導入看板',
|
||||
invalidCurrentPassword: '當前密碼錯誤',
|
||||
labels: '標籤',
|
||||
language: '語言',
|
||||
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: '刪除成員',
|
||||
searchLabels: '搜尋標籤...',
|
||||
searchMembers: '搜尋成員...',
|
||||
searchUsers: '搜尋使用者...',
|
||||
seconds: '秒',
|
||||
selectBoard: '選擇看板',
|
||||
selectList: '選擇列表',
|
||||
selectPermissions_title: '選擇權限',
|
||||
selectProject: '選擇專案',
|
||||
settings: '設置',
|
||||
stopwatch: '碼表',
|
||||
subscribeToMyOwnCardsByDefault: '默認訂閱自己創建的卡片',
|
||||
taskActions_title: '任務操作',
|
||||
tasks: '任務',
|
||||
thereIsNoPreviewAvailableForThisAttachment: '此附件無法預覽',
|
||||
time: '時間',
|
||||
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: '使用者',
|
||||
version: '版本',
|
||||
viewer: '檢視',
|
||||
writeComment: '編寫評論...',
|
||||
},
|
||||
|
||||
action: {
|
||||
addAnotherCard: '添加另一個卡片',
|
||||
addAnotherList: '添加另一個列表',
|
||||
addAnotherTask: '添加另一個任務',
|
||||
addCard: '添加卡片',
|
||||
addCard_title: '添加卡片',
|
||||
addComment: '添加評論',
|
||||
addList: '添加列表',
|
||||
addMember: '添加成員',
|
||||
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: '編輯郵箱',
|
||||
editInformation_title: '編輯信息',
|
||||
editPassword_title: '編輯密碼',
|
||||
editPermissions: '編輯權限',
|
||||
editStopwatch_title: '編輯碼表',
|
||||
editTitle_title: '編輯標題',
|
||||
editUsername_title: '編輯使用者名稱',
|
||||
hideDetails: '隱藏詳情',
|
||||
import: '導入',
|
||||
leaveBoard: '離開看板',
|
||||
leaveProject: '離開專案',
|
||||
logOut_title: '登出',
|
||||
makeCover_title: '設置封面',
|
||||
move: '移動',
|
||||
moveCard_title: '移動卡片',
|
||||
remove: '刪除',
|
||||
removeBackground: '刪除背景',
|
||||
removeCover_title: '刪除封面',
|
||||
removeFromBoard: '從看板中刪除',
|
||||
removeFromProject: '從專案中刪除',
|
||||
removeManager: '刪除管理員',
|
||||
removeMember: '刪除成員',
|
||||
save: '保存',
|
||||
showAllAttachments: '顯示所有附件 ({{hidden}} 隱藏)',
|
||||
showDetails: '顯示詳情',
|
||||
showFewerAttachments: '顯示較少附件',
|
||||
start: '開始',
|
||||
stop: '結束',
|
||||
subscribe: '訂閱',
|
||||
unsubscribe: '取消訂閱',
|
||||
uploadNewAvatar: '上傳新頭像',
|
||||
uploadNewImage: '上傳圖片',
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,8 @@
|
||||
import login from './login';
|
||||
|
||||
export default {
|
||||
language: 'zh-TW',
|
||||
country: 'tw',
|
||||
name: '繁體中文',
|
||||
embeddedLocale: login,
|
||||
};
|
||||
@@ -0,0 +1,22 @@
|
||||
export default {
|
||||
translation: {
|
||||
common: {
|
||||
emailOrUsername: '郵箱或使用者名稱',
|
||||
invalidEmailOrUsername: '無效的郵箱或使用者名稱',
|
||||
invalidPassword: '密碼錯誤',
|
||||
logInToPlanka: '登入至 Planka',
|
||||
noInternetConnection: '沒有網路連接',
|
||||
pageNotFound_title: '找不到頁面',
|
||||
password: '密碼',
|
||||
projectManagement: '專案管理',
|
||||
serverConnectionFailed: '伺服器連接失敗',
|
||||
unknownError: '未知錯誤,請稍後重試',
|
||||
useSingleSignOn: '使用單一登入',
|
||||
},
|
||||
|
||||
action: {
|
||||
logIn: '登入',
|
||||
logInWithSSO: '使用SSO登入',
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -20,6 +20,7 @@ export default class extends BaseModel {
|
||||
relatedName: 'ownCards',
|
||||
}),
|
||||
dueDate: attr(),
|
||||
isDueDateCompleted: attr(),
|
||||
stopwatch: attr(),
|
||||
isSubscribed: attr({
|
||||
getDefault: () => false,
|
||||
@@ -208,7 +209,16 @@ export default class extends BaseModel {
|
||||
if (payload.data.boardId && payload.data.boardId !== cardModel.boardId) {
|
||||
cardModel.deleteWithRelated();
|
||||
} else {
|
||||
cardModel.update(payload.data);
|
||||
cardModel.update({
|
||||
...payload.data,
|
||||
...(payload.data.dueDate === null && {
|
||||
isDueDateCompleted: null,
|
||||
}),
|
||||
...(payload.data.dueDate &&
|
||||
!cardModel.dueDate && {
|
||||
isDueDateCompleted: false,
|
||||
}),
|
||||
});
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -248,6 +258,7 @@ export default class extends BaseModel {
|
||||
'name',
|
||||
'description',
|
||||
'dueDate',
|
||||
'isDueDateCompleted',
|
||||
'stopwatch',
|
||||
]),
|
||||
...payload.card,
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export default '1.21.1';
|
||||
@@ -0,0 +1 @@
|
||||
export default '<%= pkg.version %>';
|
||||
@@ -117,7 +117,7 @@ services:
|
||||
- "5432:5432"
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U postgres -d planka"]
|
||||
test: ["CMD-SHELL", "pg_isready -U user -d planka_db"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
Generated
+116
-8
@@ -1,16 +1,17 @@
|
||||
{
|
||||
"name": "planka",
|
||||
"version": "1.20.1",
|
||||
"version": "1.21.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "planka",
|
||||
"version": "1.20.1",
|
||||
"version": "1.21.1",
|
||||
"hasInstallScript": true,
|
||||
"license": "AGPL-3.0",
|
||||
"dependencies": {
|
||||
"concurrently": "^8.2.2",
|
||||
"genversion": "^3.2.0",
|
||||
"husky": "^9.0.1",
|
||||
"lint-staged": "^15.2.5"
|
||||
},
|
||||
@@ -250,17 +251,20 @@
|
||||
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/async": {
|
||||
"version": "3.2.5",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
|
||||
"integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
|
||||
},
|
||||
"node_modules/balanced-match": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
|
||||
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
|
||||
"dev": true
|
||||
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"balanced-match": "^1.0.0",
|
||||
"concat-map": "0.0.1"
|
||||
@@ -428,8 +432,7 @@
|
||||
"node_modules/concat-map": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
|
||||
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
|
||||
"dev": true
|
||||
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
|
||||
},
|
||||
"node_modules/concurrently": {
|
||||
"version": "8.2.2",
|
||||
@@ -519,6 +522,20 @@
|
||||
"node": ">=6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/ejs": {
|
||||
"version": "3.1.10",
|
||||
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
|
||||
"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
|
||||
"dependencies": {
|
||||
"jake": "^10.8.5"
|
||||
},
|
||||
"bin": {
|
||||
"ejs": "bin/cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/emoji-regex": {
|
||||
"version": "10.3.0",
|
||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
|
||||
@@ -800,6 +817,33 @@
|
||||
"node": "^10.12.0 || >=12.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/filelist": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
|
||||
"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
|
||||
"dependencies": {
|
||||
"minimatch": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/filelist/node_modules/brace-expansion": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
|
||||
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
|
||||
"dependencies": {
|
||||
"balanced-match": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/filelist/node_modules/minimatch": {
|
||||
"version": "5.1.6",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
|
||||
"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
|
||||
"dependencies": {
|
||||
"brace-expansion": "^2.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/fill-range": {
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
|
||||
@@ -811,6 +855,14 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/find-package": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/find-package/-/find-package-1.0.0.tgz",
|
||||
"integrity": "sha512-yVn71XCCaNgxz58ERTl8nA/8YYtIQDY9mHSrgFBfiFtdNNfY0h183Vh8BRkKxD8x9TUw3ec290uJKhDVxqGZBw==",
|
||||
"dependencies": {
|
||||
"parents": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/find-up": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
|
||||
@@ -853,6 +905,30 @@
|
||||
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/genversion": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/genversion/-/genversion-3.2.0.tgz",
|
||||
"integrity": "sha512-OIYSX6XYA8PHecLDCTri30hadSZfAjZ8Iq1+BBDXqLWP4dRLuJNLoNjsSWtTpw97IccK2LDWzkEstxAB8GdN7g==",
|
||||
"dependencies": {
|
||||
"commander": "^7.2.0",
|
||||
"ejs": "^3.1.9",
|
||||
"find-package": "^1.0.0"
|
||||
},
|
||||
"bin": {
|
||||
"genversion": "bin/genversion.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/genversion/node_modules/commander": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
|
||||
"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/get-caller-file": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
|
||||
@@ -1083,6 +1159,23 @@
|
||||
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
|
||||
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
|
||||
},
|
||||
"node_modules/jake": {
|
||||
"version": "10.9.2",
|
||||
"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
|
||||
"integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
|
||||
"dependencies": {
|
||||
"async": "^3.2.3",
|
||||
"chalk": "^4.0.2",
|
||||
"filelist": "^1.0.4",
|
||||
"minimatch": "^3.1.2"
|
||||
},
|
||||
"bin": {
|
||||
"jake": "bin/cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/js-yaml": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
||||
@@ -1340,7 +1433,6 @@
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
|
||||
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
},
|
||||
@@ -1466,6 +1558,14 @@
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/parents": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
|
||||
"integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
|
||||
"dependencies": {
|
||||
"path-platform": "~0.11.15"
|
||||
}
|
||||
},
|
||||
"node_modules/path-exists": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
|
||||
@@ -1492,6 +1592,14 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/path-platform": {
|
||||
"version": "0.11.15",
|
||||
"resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
|
||||
"integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
|
||||
"engines": {
|
||||
"node": ">= 0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
|
||||
+3
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planka",
|
||||
"version": "1.20.1",
|
||||
"version": "1.21.1",
|
||||
"private": true,
|
||||
"homepage": "https://plankanban.github.io/planka",
|
||||
"repository": {
|
||||
@@ -16,6 +16,7 @@
|
||||
"client:test": "npm test --prefix client",
|
||||
"docker:build": "docker build -t ghcr.io/plankanban/planka:local -f Dockerfile .",
|
||||
"docker:build:base": "docker build -t ghcr.io/plankanban/planka:base-local -f Dockerfile.base .",
|
||||
"gv": "genversion --source ./ --template client/version-template.ejs client/src/version.js",
|
||||
"postinstall": "(cd server && npm i && cd ../client && npm i)",
|
||||
"lint": "npm run server:lint && npm run client:lint",
|
||||
"prepare": "husky",
|
||||
@@ -57,6 +58,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"concurrently": "^8.2.2",
|
||||
"genversion": "^3.2.0",
|
||||
"husky": "^9.0.1",
|
||||
"lint-staged": "^15.2.5"
|
||||
},
|
||||
|
||||
@@ -56,6 +56,11 @@ module.exports = {
|
||||
dueDate: {
|
||||
type: 'string',
|
||||
custom: dueDateValidator,
|
||||
allowNull: true,
|
||||
},
|
||||
isDueDateCompleted: {
|
||||
type: 'boolean',
|
||||
allowNull: true,
|
||||
},
|
||||
stopwatch: {
|
||||
type: 'json',
|
||||
@@ -95,7 +100,14 @@ module.exports = {
|
||||
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||
}
|
||||
|
||||
const values = _.pick(inputs, ['position', 'name', 'description', 'dueDate', 'stopwatch']);
|
||||
const values = _.pick(inputs, [
|
||||
'position',
|
||||
'name',
|
||||
'description',
|
||||
'dueDate',
|
||||
'isDueDateCompleted',
|
||||
'stopwatch',
|
||||
]);
|
||||
|
||||
const card = await sails.helpers.cards.createOne
|
||||
.with({
|
||||
|
||||
@@ -80,6 +80,10 @@ module.exports = {
|
||||
custom: dueDateValidator,
|
||||
allowNull: true,
|
||||
},
|
||||
isDueDateCompleted: {
|
||||
type: 'boolean',
|
||||
allowNull: true,
|
||||
},
|
||||
stopwatch: {
|
||||
type: 'json',
|
||||
custom: stopwatchValidator,
|
||||
@@ -173,6 +177,7 @@ module.exports = {
|
||||
'name',
|
||||
'description',
|
||||
'dueDate',
|
||||
'isDueDateCompleted',
|
||||
'stopwatch',
|
||||
'isSubscribed',
|
||||
]);
|
||||
|
||||
@@ -49,6 +49,14 @@ module.exports = {
|
||||
throw 'positionMustBeInValues';
|
||||
}
|
||||
|
||||
if (values.dueDate) {
|
||||
if (_.isNil(values.isDueDateCompleted)) {
|
||||
values.isDueDateCompleted = false;
|
||||
}
|
||||
} else {
|
||||
delete values.isDueDateCompleted;
|
||||
}
|
||||
|
||||
const cards = await sails.helpers.lists.getCards(values.list.id);
|
||||
|
||||
const { position, repositions } = sails.helpers.utils.insertToPositionables(
|
||||
|
||||
@@ -77,6 +77,7 @@ module.exports = {
|
||||
'name',
|
||||
'description',
|
||||
'dueDate',
|
||||
'isDueDateCompleted',
|
||||
'stopwatch',
|
||||
]),
|
||||
...values,
|
||||
|
||||
@@ -135,6 +135,20 @@ module.exports = {
|
||||
});
|
||||
}
|
||||
|
||||
const dueDate = _.isUndefined(values.dueDate) ? inputs.record.dueDate : values.dueDate;
|
||||
|
||||
if (dueDate) {
|
||||
const isDueDateCompleted = _.isUndefined(values.isDueDateCompleted)
|
||||
? inputs.record.isDueDateCompleted
|
||||
: values.isDueDateCompleted;
|
||||
|
||||
if (_.isNull(isDueDateCompleted)) {
|
||||
values.isDueDateCompleted = false;
|
||||
}
|
||||
} else {
|
||||
values.isDueDateCompleted = null;
|
||||
}
|
||||
|
||||
let card;
|
||||
if (_.isEmpty(values)) {
|
||||
card = inputs.record;
|
||||
|
||||
@@ -28,6 +28,11 @@ module.exports = {
|
||||
type: 'ref',
|
||||
columnName: 'due_date',
|
||||
},
|
||||
isDueDateCompleted: {
|
||||
type: 'boolean',
|
||||
allowNull: true,
|
||||
columnName: 'is_due_date_completed',
|
||||
},
|
||||
stopwatch: {
|
||||
type: 'json',
|
||||
},
|
||||
|
||||
@@ -30,6 +30,7 @@ const LANGUAGES = [
|
||||
'uk-UA',
|
||||
'uz-UZ',
|
||||
'zh-CN',
|
||||
'zh-TW',
|
||||
];
|
||||
|
||||
const OIDC = {
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
module.exports.up = async (knex) => {
|
||||
await knex.schema.table('card', (table) => {
|
||||
/* Columns */
|
||||
|
||||
table.boolean('is_due_date_completed');
|
||||
});
|
||||
|
||||
return knex('card')
|
||||
.update({
|
||||
isDueDateCompleted: false,
|
||||
})
|
||||
.whereNotNull('due_date');
|
||||
};
|
||||
|
||||
module.exports.down = (knex) =>
|
||||
knex.schema.table('card', (table) => {
|
||||
table.dropColumn('is_due_date_completed');
|
||||
});
|
||||
Reference in New Issue
Block a user