mirror of
https://github.com/plankanban/planka.git
synced 2025-07-19 05:09:43 +02:00
Add covers for cards
This commit is contained in:
parent
f743f4ea8b
commit
3dffed90c6
26 changed files with 315 additions and 98 deletions
|
@ -23,6 +23,7 @@ const Card = React.memo(
|
||||||
name,
|
name,
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
timer,
|
||||||
|
coverUrl,
|
||||||
isPersisted,
|
isPersisted,
|
||||||
notificationsTotal,
|
notificationsTotal,
|
||||||
users,
|
users,
|
||||||
|
@ -63,51 +64,60 @@ const Card = React.memo(
|
||||||
|
|
||||||
const contentNode = (
|
const contentNode = (
|
||||||
<>
|
<>
|
||||||
{labels.length > 0 && (
|
{coverUrl && <img src={coverUrl} alt="" className={styles.cover} />}
|
||||||
<span className={styles.labels}>
|
<div className={styles.details}>
|
||||||
{labels.map((label) => (
|
{labels.length > 0 && (
|
||||||
<span key={label.id} className={classNames(styles.attachment, styles.attachmentLeft)}>
|
<span className={styles.labels}>
|
||||||
<Label name={label.name} color={label.color} size="tiny" />
|
{labels.map((label) => (
|
||||||
</span>
|
<span
|
||||||
))}
|
key={label.id}
|
||||||
</span>
|
className={classNames(styles.attachment, styles.attachmentLeft)}
|
||||||
)}
|
>
|
||||||
<div className={styles.name}>{name}</div>
|
<Label name={label.name} color={label.color} size="tiny" />
|
||||||
{tasks.length > 0 && <Tasks items={tasks} />}
|
</span>
|
||||||
{(dueDate || timer || notificationsTotal > 0) && (
|
))}
|
||||||
<span className={styles.attachments}>
|
</span>
|
||||||
{notificationsTotal > 0 && (
|
)}
|
||||||
<span
|
<div className={styles.name}>{name}</div>
|
||||||
className={classNames(
|
{tasks.length > 0 && <Tasks items={tasks} />}
|
||||||
styles.attachment,
|
{(dueDate || timer || notificationsTotal > 0) && (
|
||||||
styles.attachmentLeft,
|
<span className={styles.attachments}>
|
||||||
styles.notification,
|
{notificationsTotal > 0 && (
|
||||||
)}
|
<span
|
||||||
>
|
className={classNames(
|
||||||
{notificationsTotal}
|
styles.attachment,
|
||||||
</span>
|
styles.attachmentLeft,
|
||||||
)}
|
styles.notification,
|
||||||
{dueDate && (
|
)}
|
||||||
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
>
|
||||||
<DueDate value={dueDate} size="tiny" />
|
{notificationsTotal}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{timer && (
|
{dueDate && (
|
||||||
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
||||||
<Timer startedAt={timer.startedAt} total={timer.total} size="tiny" />
|
<DueDate value={dueDate} size="tiny" />
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</span>
|
{timer && (
|
||||||
)}
|
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
||||||
{users.length > 0 && (
|
<Timer startedAt={timer.startedAt} total={timer.total} size="tiny" />
|
||||||
<span className={classNames(styles.attachments, styles.attachmentsRight)}>
|
</span>
|
||||||
{users.map((user) => (
|
)}
|
||||||
<span key={user.id} className={classNames(styles.attachment, styles.attachmentRight)}>
|
</span>
|
||||||
<User name={user.name} avatarUrl={user.avatarUrl} size="tiny" />
|
)}
|
||||||
</span>
|
{users.length > 0 && (
|
||||||
))}
|
<span className={classNames(styles.attachments, styles.attachmentsRight)}>
|
||||||
</span>
|
{users.map((user) => (
|
||||||
)}
|
<span
|
||||||
|
key={user.id}
|
||||||
|
className={classNames(styles.attachment, styles.attachmentRight)}
|
||||||
|
>
|
||||||
|
<User name={user.name} avatarUrl={user.avatarUrl} size="tiny" />
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -121,7 +131,7 @@ const Card = React.memo(
|
||||||
{isPersisted ? (
|
{isPersisted ? (
|
||||||
<>
|
<>
|
||||||
<Link
|
<Link
|
||||||
to={isPersisted && Paths.CARDS.replace(':id', id)}
|
to={Paths.CARDS.replace(':id', id)}
|
||||||
className={styles.content}
|
className={styles.content}
|
||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
>
|
>
|
||||||
|
@ -173,6 +183,7 @@ Card.propTypes = {
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
dueDate: PropTypes.instanceOf(Date),
|
dueDate: PropTypes.instanceOf(Date),
|
||||||
timer: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
timer: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
|
coverUrl: PropTypes.string,
|
||||||
isPersisted: PropTypes.bool.isRequired,
|
isPersisted: PropTypes.bool.isRequired,
|
||||||
notificationsTotal: PropTypes.number.isRequired,
|
notificationsTotal: PropTypes.number.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
|
@ -196,6 +207,7 @@ Card.propTypes = {
|
||||||
Card.defaultProps = {
|
Card.defaultProps = {
|
||||||
dueDate: undefined,
|
dueDate: undefined,
|
||||||
timer: undefined,
|
timer: undefined,
|
||||||
|
coverUrl: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Card;
|
export default Card;
|
||||||
|
|
|
@ -68,7 +68,6 @@
|
||||||
.content {
|
.content {
|
||||||
cursor: grab;
|
cursor: grab;
|
||||||
display: block;
|
display: block;
|
||||||
padding: 6px 8px 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.content:after {
|
.content:after {
|
||||||
|
@ -77,6 +76,15 @@
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cover {
|
||||||
|
border-radius: 3px 3px 0 0;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.details {
|
||||||
|
padding: 6px 8px 0;
|
||||||
|
}
|
||||||
|
|
||||||
.labels {
|
.labels {
|
||||||
display: block;
|
display: block;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
|
|
@ -3,7 +3,18 @@ import PropTypes from 'prop-types';
|
||||||
|
|
||||||
import Item from './Item';
|
import Item from './Item';
|
||||||
|
|
||||||
const Attachments = React.memo(({ items, onUpdate, onDelete }) => {
|
const Attachments = React.memo(({ items, onUpdate, onDelete, onCoverUpdate }) => {
|
||||||
|
const handleCoverSelect = useCallback(
|
||||||
|
(id) => {
|
||||||
|
onCoverUpdate(id);
|
||||||
|
},
|
||||||
|
[onCoverUpdate],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleCoverDeselect = useCallback(() => {
|
||||||
|
onCoverUpdate(null);
|
||||||
|
}, [onCoverUpdate]);
|
||||||
|
|
||||||
const handleUpdate = useCallback(
|
const handleUpdate = useCallback(
|
||||||
(id, data) => {
|
(id, data) => {
|
||||||
onUpdate(id, data);
|
onUpdate(id, data);
|
||||||
|
@ -25,9 +36,12 @@ const Attachments = React.memo(({ items, onUpdate, onDelete }) => {
|
||||||
key={item.id}
|
key={item.id}
|
||||||
name={item.name}
|
name={item.name}
|
||||||
url={item.url}
|
url={item.url}
|
||||||
thumbnailUrl={item.thumbnailUrl}
|
coverUrl={item.coverUrl}
|
||||||
createdAt={item.createdAt}
|
createdAt={item.createdAt}
|
||||||
|
isCover={item.isCover}
|
||||||
isPersisted={item.isPersisted}
|
isPersisted={item.isPersisted}
|
||||||
|
onCoverSelect={() => handleCoverSelect(item.id)}
|
||||||
|
onCoverDeselect={handleCoverDeselect}
|
||||||
onUpdate={(data) => handleUpdate(item.id, data)}
|
onUpdate={(data) => handleUpdate(item.id, data)}
|
||||||
onDelete={() => handleDelete(item.id)}
|
onDelete={() => handleDelete(item.id)}
|
||||||
/>
|
/>
|
||||||
|
@ -40,6 +54,7 @@ Attachments.propTypes = {
|
||||||
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
|
onCoverUpdate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Attachments;
|
export default Attachments;
|
||||||
|
|
|
@ -2,20 +2,44 @@ import React, { useCallback } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Button, Icon, Loader } from 'semantic-ui-react';
|
import { Button, Icon, Label, Loader } from 'semantic-ui-react';
|
||||||
|
|
||||||
import EditPopup from './EditPopup';
|
import EditPopup from './EditPopup';
|
||||||
|
|
||||||
import styles from './Item.module.css';
|
import styles from './Item.module.css';
|
||||||
|
|
||||||
const Item = React.memo(
|
const Item = React.memo(
|
||||||
({ name, url, thumbnailUrl, createdAt, isPersisted, onUpdate, onDelete }) => {
|
({
|
||||||
|
name,
|
||||||
|
url,
|
||||||
|
coverUrl,
|
||||||
|
createdAt,
|
||||||
|
isCover,
|
||||||
|
isPersisted,
|
||||||
|
onCoverSelect,
|
||||||
|
onCoverDeselect,
|
||||||
|
onUpdate,
|
||||||
|
onDelete,
|
||||||
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
|
||||||
const handleClick = useCallback(() => {
|
const handleClick = useCallback(() => {
|
||||||
window.open(url, '_blank');
|
window.open(url, '_blank');
|
||||||
}, [url]);
|
}, [url]);
|
||||||
|
|
||||||
|
const handleToggleCoverClick = useCallback(
|
||||||
|
(event) => {
|
||||||
|
event.stopPropagation();
|
||||||
|
|
||||||
|
if (isCover) {
|
||||||
|
onCoverDeselect();
|
||||||
|
} else {
|
||||||
|
onCoverSelect();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[isCover, onCoverSelect, onCoverDeselect],
|
||||||
|
);
|
||||||
|
|
||||||
if (!isPersisted) {
|
if (!isPersisted) {
|
||||||
return (
|
return (
|
||||||
<div className={classNames(styles.wrapper, styles.wrapperSubmitting)}>
|
<div className={classNames(styles.wrapper, styles.wrapperSubmitting)}>
|
||||||
|
@ -36,19 +60,46 @@ const Item = React.memo(
|
||||||
<div
|
<div
|
||||||
className={styles.thumbnail}
|
className={styles.thumbnail}
|
||||||
style={{
|
style={{
|
||||||
backgroundImage: thumbnailUrl && `url(${thumbnailUrl}`,
|
backgroundImage: coverUrl && `url(${coverUrl}`,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{!thumbnailUrl && <span className={styles.extension}>{extension || '-'}</span>}
|
{coverUrl ? (
|
||||||
|
isCover && (
|
||||||
|
<Label corner="left" size="tiny" icon="star" className={styles.thumbnailLabel} />
|
||||||
|
)
|
||||||
|
) : (
|
||||||
|
<span className={styles.extension}>{extension || '-'}</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.details}>
|
<div className={styles.details}>
|
||||||
<span className={styles.name}>{name}</span>
|
<span className={styles.name}>{name}</span>
|
||||||
<span className={styles.options}>
|
<span className={styles.date}>
|
||||||
{t('format:longDateTime', {
|
{t('format:longDateTime', {
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
value: createdAt,
|
value: createdAt,
|
||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
|
{coverUrl && (
|
||||||
|
<span className={styles.options}>
|
||||||
|
<button type="button" className={styles.option} onClick={handleToggleCoverClick}>
|
||||||
|
<Icon
|
||||||
|
name="window maximize outline"
|
||||||
|
flipped="vertically"
|
||||||
|
size="small"
|
||||||
|
className={styles.optionIcon}
|
||||||
|
/>
|
||||||
|
<span className={styles.optionText}>
|
||||||
|
{isCover
|
||||||
|
? t('action.removeCover', {
|
||||||
|
context: 'title',
|
||||||
|
})
|
||||||
|
: t('action.makeCover', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<EditPopup
|
<EditPopup
|
||||||
defaultData={{
|
defaultData={{
|
||||||
|
@ -69,16 +120,19 @@ const Item = React.memo(
|
||||||
Item.propTypes = {
|
Item.propTypes = {
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
url: PropTypes.string,
|
url: PropTypes.string,
|
||||||
thumbnailUrl: PropTypes.string,
|
coverUrl: PropTypes.string,
|
||||||
createdAt: PropTypes.instanceOf(Date),
|
createdAt: PropTypes.instanceOf(Date),
|
||||||
|
isCover: PropTypes.bool.isRequired,
|
||||||
isPersisted: PropTypes.bool.isRequired,
|
isPersisted: PropTypes.bool.isRequired,
|
||||||
|
onCoverSelect: PropTypes.func.isRequired,
|
||||||
|
onCoverDeselect: PropTypes.func.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
Item.defaultProps = {
|
Item.defaultProps = {
|
||||||
url: undefined,
|
url: undefined,
|
||||||
thumbnailUrl: undefined,
|
coverUrl: undefined,
|
||||||
createdAt: undefined,
|
createdAt: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -16,9 +16,16 @@
|
||||||
background-color: rgba(9, 30, 66, 0.08) !important;
|
background-color: rgba(9, 30, 66, 0.08) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.date {
|
||||||
|
display: block;
|
||||||
|
color: #6b808c;
|
||||||
|
line-height: 20px;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
.details {
|
.details {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 8px 32px 8px 128px;
|
padding: 6px 32px 6px 128px;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
min-height: 80px;
|
min-height: 80px;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
|
@ -45,11 +52,31 @@
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.option {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: #6b808c;
|
||||||
|
cursor: pointer;
|
||||||
|
outline: none;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.option:hover {
|
||||||
|
color: #172b4d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.optionIcon {
|
||||||
|
margin-right: 6px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.optionText {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
.options {
|
.options {
|
||||||
display: block;
|
display: block;
|
||||||
color: #6b808c;
|
color: #6b808c;
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
margin-bottom: 8px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.thumbnail {
|
.thumbnail {
|
||||||
|
@ -70,6 +97,10 @@
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.thumbnailLabel {
|
||||||
|
border-color: rgba(255, 255, 255, 0.8) !important;
|
||||||
|
}
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 8px;
|
||||||
|
|
|
@ -98,6 +98,15 @@ const CardModal = React.memo(
|
||||||
[onUpdate],
|
[onUpdate],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handleCoverUpdate = useCallback(
|
||||||
|
(newCoverAttachmentId) => {
|
||||||
|
onUpdate({
|
||||||
|
coverAttachmentId: newCoverAttachmentId,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[onUpdate],
|
||||||
|
);
|
||||||
|
|
||||||
const handleAttachmentFileSelect = useCallback(
|
const handleAttachmentFileSelect = useCallback(
|
||||||
(file) => {
|
(file) => {
|
||||||
onAttachmentCreate({
|
onAttachmentCreate({
|
||||||
|
@ -278,6 +287,7 @@ const CardModal = React.memo(
|
||||||
items={attachments}
|
items={attachments}
|
||||||
onUpdate={onAttachmentUpdate}
|
onUpdate={onAttachmentUpdate}
|
||||||
onDelete={onAttachmentDelete}
|
onDelete={onAttachmentDelete}
|
||||||
|
onCoverUpdate={handleCoverUpdate}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -34,7 +34,7 @@ const makeMapStateToProps = () => {
|
||||||
const allProjectMemberships = membershipsForCurrentProjectSelector(state);
|
const allProjectMemberships = membershipsForCurrentProjectSelector(state);
|
||||||
const allLabels = labelsForCurrentBoardSelector(state);
|
const allLabels = labelsForCurrentBoardSelector(state);
|
||||||
|
|
||||||
const { name, dueDate, timer, isPersisted } = cardByIdSelector(state, id);
|
const { name, dueDate, timer, coverUrl, isPersisted } = cardByIdSelector(state, id);
|
||||||
|
|
||||||
const users = usersByCardIdSelector(state, id);
|
const users = usersByCardIdSelector(state, id);
|
||||||
const labels = labelsByCardIdSelector(state, id);
|
const labels = labelsByCardIdSelector(state, id);
|
||||||
|
@ -47,6 +47,7 @@ const makeMapStateToProps = () => {
|
||||||
name,
|
name,
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
timer,
|
||||||
|
coverUrl,
|
||||||
isPersisted,
|
isPersisted,
|
||||||
notificationsTotal,
|
notificationsTotal,
|
||||||
users,
|
users,
|
||||||
|
|
|
@ -156,7 +156,9 @@ export default {
|
||||||
editTitle_title: 'Edit Title',
|
editTitle_title: 'Edit Title',
|
||||||
editUsername_title: 'Edit Username',
|
editUsername_title: 'Edit Username',
|
||||||
logOut_title: 'Log Out',
|
logOut_title: 'Log Out',
|
||||||
|
makeCover_title: 'Make Cover',
|
||||||
remove: 'Remove',
|
remove: 'Remove',
|
||||||
|
removeCover_title: 'Remove Cover',
|
||||||
removeFromProject: 'Remove from project',
|
removeFromProject: 'Remove from project',
|
||||||
removeMember: 'Remove member',
|
removeMember: 'Remove member',
|
||||||
save: 'Save',
|
save: 'Save',
|
||||||
|
|
|
@ -157,7 +157,9 @@ export default {
|
||||||
editTitle: 'Изменить название',
|
editTitle: 'Изменить название',
|
||||||
editUsername_title: 'Изменить имя пользователя',
|
editUsername_title: 'Изменить имя пользователя',
|
||||||
logOut: 'Выйти',
|
logOut: 'Выйти',
|
||||||
|
makeCover: 'Сделать обложкой',
|
||||||
remove: 'Убрать',
|
remove: 'Убрать',
|
||||||
|
removeCover: 'Убрать обложку',
|
||||||
removeFromProject: 'Удалить из проекта',
|
removeFromProject: 'Удалить из проекта',
|
||||||
removeMember: 'Удалить участника',
|
removeMember: 'Удалить участника',
|
||||||
save: 'Сохранить',
|
save: 'Сохранить',
|
||||||
|
|
|
@ -8,7 +8,7 @@ export default class extends Model {
|
||||||
static fields = {
|
static fields = {
|
||||||
id: attr(),
|
id: attr(),
|
||||||
url: attr(),
|
url: attr(),
|
||||||
thumbnailUrl: attr(),
|
coverUrl: attr(),
|
||||||
name: attr(),
|
name: attr(),
|
||||||
cardId: fk({
|
cardId: fk({
|
||||||
to: 'Card',
|
to: 'Card',
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { Model, attr, fk, many } from 'redux-orm';
|
import { Model, attr, fk, many, oneToOne } from 'redux-orm';
|
||||||
|
|
||||||
import ActionTypes from '../constants/ActionTypes';
|
import ActionTypes from '../constants/ActionTypes';
|
||||||
import Config from '../constants/Config';
|
import Config from '../constants/Config';
|
||||||
|
@ -32,6 +32,11 @@ export default class extends Model {
|
||||||
as: 'board',
|
as: 'board',
|
||||||
relatedName: 'cards',
|
relatedName: 'cards',
|
||||||
}),
|
}),
|
||||||
|
coverAttachmentId: oneToOne({
|
||||||
|
to: 'Attachment',
|
||||||
|
as: 'coverAttachment',
|
||||||
|
relatedName: 'coveredCard',
|
||||||
|
}),
|
||||||
users: many('User', 'cards'),
|
users: many('User', 'cards'),
|
||||||
labels: many('Label', 'cards'),
|
labels: many('Label', 'cards'),
|
||||||
};
|
};
|
||||||
|
|
|
@ -64,6 +64,7 @@ export const makeCardByIdSelector = () =>
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...cardModel.ref,
|
...cardModel.ref,
|
||||||
|
coverUrl: cardModel.coverAttachment && cardModel.coverAttachment.coverUrl,
|
||||||
isPersisted: !isLocalId(id),
|
isPersisted: !isLocalId(id),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
|
@ -355,6 +355,7 @@ export const attachmentsForCurrentCardSelector = createSelector(
|
||||||
.toRefArray()
|
.toRefArray()
|
||||||
.map((attachment) => ({
|
.map((attachment) => ({
|
||||||
...attachment,
|
...attachment,
|
||||||
|
isCover: attachment.id === cardModel.coverAttachmentId,
|
||||||
isPersisted: !isLocalId(attachment.id),
|
isPersisted: !isLocalId(attachment.id),
|
||||||
}));
|
}));
|
||||||
},
|
},
|
||||||
|
|
|
@ -51,6 +51,7 @@ module.exports = {
|
||||||
|
|
||||||
const attachment = await sails.helpers.createAttachment(
|
const attachment = await sails.helpers.createAttachment(
|
||||||
card,
|
card,
|
||||||
|
currentUser,
|
||||||
{
|
{
|
||||||
dirname: file.extra.dirname,
|
dirname: file.extra.dirname,
|
||||||
filename: file.filename,
|
filename: file.filename,
|
||||||
|
|
|
@ -27,7 +27,7 @@ module.exports = {
|
||||||
.intercept('pathNotFound', () => Errors.ATTACHMENT_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.ATTACHMENT_NOT_FOUND);
|
||||||
|
|
||||||
let { attachment } = attachmentToProjectPath;
|
let { attachment } = attachmentToProjectPath;
|
||||||
const { board, project } = attachmentToProjectPath;
|
const { card, board, project } = attachmentToProjectPath;
|
||||||
|
|
||||||
const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
|
const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
|
||||||
project.id,
|
project.id,
|
||||||
|
@ -38,7 +38,7 @@ module.exports = {
|
||||||
throw Errors.ATTACHMENT_NOT_FOUND; // Forbidden
|
throw Errors.ATTACHMENT_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
attachment = await sails.helpers.deleteAttachment(attachment, board, this.req);
|
attachment = await sails.helpers.deleteAttachment(attachment, card, board, this.req);
|
||||||
|
|
||||||
if (!attachment) {
|
if (!attachment) {
|
||||||
throw Errors.ATTACHMENT_NOT_FOUND;
|
throw Errors.ATTACHMENT_NOT_FOUND;
|
||||||
|
|
|
@ -20,6 +20,11 @@ module.exports = {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
regex: /^[0-9]+$/,
|
regex: /^[0-9]+$/,
|
||||||
},
|
},
|
||||||
|
coverAttachmentId: {
|
||||||
|
type: 'string',
|
||||||
|
regex: /^[0-9]+$/,
|
||||||
|
allowNull: true,
|
||||||
|
},
|
||||||
position: {
|
position: {
|
||||||
type: 'number',
|
type: 'number',
|
||||||
},
|
},
|
||||||
|
@ -91,6 +96,7 @@ module.exports = {
|
||||||
}
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, [
|
const values = _.pick(inputs, [
|
||||||
|
'coverAttachmentId',
|
||||||
'position',
|
'position',
|
||||||
'name',
|
'name',
|
||||||
'description',
|
'description',
|
||||||
|
|
|
@ -30,28 +30,44 @@ module.exports = {
|
||||||
Buffer.concat(parts.map((part) => (util.isBuffer(part) ? part : Buffer.from(part)))),
|
Buffer.concat(parts.map((part) => (util.isBuffer(part) ? part : Buffer.from(part)))),
|
||||||
);
|
);
|
||||||
|
|
||||||
let thumbnailBuffer;
|
|
||||||
|
|
||||||
try {
|
|
||||||
thumbnailBuffer = await sharp(buffer).resize(240, 240).jpeg().toBuffer();
|
|
||||||
} catch (error) {} // eslint-disable-line no-empty
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const dirname = uuid();
|
const dirname = uuid();
|
||||||
const dirPath = path.join(sails.config.custom.attachmentsPath, dirname);
|
|
||||||
|
|
||||||
fs.mkdirSync(dirPath);
|
const rootPath = path.join(sails.config.custom.attachmentsPath, dirname);
|
||||||
|
fs.mkdirSync(rootPath);
|
||||||
|
|
||||||
if (thumbnailBuffer) {
|
await writeFile(path.join(rootPath, file.filename), buffer);
|
||||||
await writeFile(path.join(dirPath, '240.jpg'), thumbnailBuffer);
|
|
||||||
|
const image = sharp(buffer);
|
||||||
|
let imageMetadata;
|
||||||
|
|
||||||
|
try {
|
||||||
|
imageMetadata = await image.metadata();
|
||||||
|
} catch (error) {} // eslint-disable-line no-empty
|
||||||
|
|
||||||
|
if (imageMetadata) {
|
||||||
|
let cover256Buffer;
|
||||||
|
if (imageMetadata.height > imageMetadata.width) {
|
||||||
|
cover256Buffer = await image.resize(256, 320).jpeg().toBuffer();
|
||||||
|
} else {
|
||||||
|
cover256Buffer = await image
|
||||||
|
.resize({
|
||||||
|
width: 256,
|
||||||
|
})
|
||||||
|
.jpeg()
|
||||||
|
.toBuffer();
|
||||||
|
}
|
||||||
|
|
||||||
|
const thumbnailsPath = path.join(rootPath, 'thumbnails');
|
||||||
|
fs.mkdirSync(thumbnailsPath);
|
||||||
|
|
||||||
|
await writeFile(path.join(thumbnailsPath, 'cover-256.jpg'), cover256Buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
await writeFile(path.join(dirPath, file.filename), buffer);
|
|
||||||
|
|
||||||
// eslint-disable-next-line no-param-reassign
|
// eslint-disable-next-line no-param-reassign
|
||||||
file.extra = {
|
file.extra = {
|
||||||
dirname,
|
dirname,
|
||||||
isImage: !!thumbnailBuffer,
|
isImage: !!imageMetadata,
|
||||||
};
|
};
|
||||||
|
|
||||||
return done();
|
return done();
|
||||||
|
|
|
@ -4,6 +4,10 @@ module.exports = {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
user: {
|
||||||
|
type: 'ref',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
values: {
|
values: {
|
||||||
type: 'json',
|
type: 'json',
|
||||||
required: true,
|
required: true,
|
||||||
|
@ -17,6 +21,7 @@ module.exports = {
|
||||||
const attachment = await Attachment.create({
|
const attachment = await Attachment.create({
|
||||||
...inputs.values,
|
...inputs.values,
|
||||||
cardId: inputs.card.id,
|
cardId: inputs.card.id,
|
||||||
|
userId: inputs.user.id,
|
||||||
}).fetch();
|
}).fetch();
|
||||||
|
|
||||||
sails.sockets.broadcast(
|
sails.sockets.broadcast(
|
||||||
|
@ -28,6 +33,16 @@ module.exports = {
|
||||||
inputs.request,
|
inputs.request,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (!inputs.card.coverAttachmentId && attachment.isImage) {
|
||||||
|
await sails.helpers.updateCard.with({
|
||||||
|
record: inputs.card,
|
||||||
|
values: {
|
||||||
|
coverAttachmentId: attachment.id,
|
||||||
|
},
|
||||||
|
request: inputs.request,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return exits.success(attachment);
|
return exits.success(attachment);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,10 +2,11 @@ const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const util = require('util');
|
const util = require('util');
|
||||||
const stream = require('stream');
|
const stream = require('stream');
|
||||||
|
const streamToArray = require('stream-to-array');
|
||||||
const { v4: uuid } = require('uuid');
|
const { v4: uuid } = require('uuid');
|
||||||
const sharp = require('sharp');
|
const sharp = require('sharp');
|
||||||
|
|
||||||
const pipeline = util.promisify(stream.pipeline);
|
const writeFile = util.promisify(fs.writeFile);
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
sync: true,
|
sync: true,
|
||||||
|
@ -25,18 +26,20 @@ module.exports = {
|
||||||
}
|
}
|
||||||
firstFileHandled = true;
|
firstFileHandled = true;
|
||||||
|
|
||||||
const resize = sharp().resize(100, 100).jpeg();
|
const buffer = await streamToArray(file).then((parts) =>
|
||||||
const passThrought = new stream.PassThrough();
|
Buffer.concat(parts.map((part) => (util.isBuffer(part) ? part : Buffer.from(part)))),
|
||||||
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await pipeline(file, resize, passThrought);
|
const square100Buffer = await sharp(buffer).resize(100, 100).jpeg().toBuffer();
|
||||||
|
|
||||||
const dirname = uuid();
|
const dirname = uuid();
|
||||||
const dirPath = path.join(sails.config.custom.userAvatarsPath, dirname);
|
|
||||||
|
|
||||||
fs.mkdirSync(dirPath);
|
const rootPath = path.join(sails.config.custom.userAvatarsPath, dirname);
|
||||||
|
fs.mkdirSync(rootPath);
|
||||||
|
|
||||||
await pipeline(passThrought, fs.createWriteStream(path.join(dirPath, '100.jpg')));
|
await writeFile(path.join(rootPath, 'original.jpg'), buffer);
|
||||||
|
await writeFile(path.join(rootPath, 'square-100.jpg'), square100Buffer);
|
||||||
|
|
||||||
// eslint-disable-next-line no-param-reassign
|
// eslint-disable-next-line no-param-reassign
|
||||||
file.extra = {
|
file.extra = {
|
||||||
|
|
|
@ -7,6 +7,10 @@ module.exports = {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
card: {
|
||||||
|
type: 'ref',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
board: {
|
board: {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
required: true,
|
required: true,
|
||||||
|
@ -17,6 +21,16 @@ module.exports = {
|
||||||
},
|
},
|
||||||
|
|
||||||
async fn(inputs, exits) {
|
async fn(inputs, exits) {
|
||||||
|
if (inputs.record.id === inputs.card.coverAttachmentId) {
|
||||||
|
await sails.helpers.updateCard.with({
|
||||||
|
record: inputs.card,
|
||||||
|
values: {
|
||||||
|
coverAttachmentId: null,
|
||||||
|
},
|
||||||
|
request: inputs.request,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const attachment = await Attachment.archiveOne(inputs.record.id);
|
const attachment = await Attachment.archiveOne(inputs.record.id);
|
||||||
|
|
||||||
if (attachment) {
|
if (attachment) {
|
||||||
|
|
|
@ -15,35 +15,43 @@ module.exports = {
|
||||||
},
|
},
|
||||||
list: {
|
list: {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
required: true,
|
|
||||||
},
|
},
|
||||||
user: {
|
user: {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
required: true,
|
|
||||||
},
|
},
|
||||||
request: {
|
request: {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
exits: {
|
||||||
|
invalidParams: {},
|
||||||
|
},
|
||||||
|
|
||||||
async fn(inputs, exits) {
|
async fn(inputs, exits) {
|
||||||
const { isSubscribed, ...values } = inputs.values;
|
const { isSubscribed, ...values } = inputs.values;
|
||||||
|
|
||||||
let listId;
|
|
||||||
if (inputs.toList) {
|
if (inputs.toList) {
|
||||||
listId = inputs.toList.id;
|
if (!inputs.list || !inputs.user) {
|
||||||
|
throw 'invalidParams';
|
||||||
if (listId !== inputs.list.id) {
|
|
||||||
values.listId = listId;
|
|
||||||
} else {
|
|
||||||
delete inputs.toList; // eslint-disable-line no-param-reassign
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
listId = inputs.list.id;
|
if (inputs.toList.id === inputs.list.id) {
|
||||||
|
delete inputs.toList; // eslint-disable-line no-param-reassign
|
||||||
|
} else {
|
||||||
|
values.listId = inputs.toList.id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_.isUndefined(isSubscribed) && !inputs.user) {
|
||||||
|
throw 'invalidParams';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_.isUndefined(values.position)) {
|
if (!_.isUndefined(values.position)) {
|
||||||
const cards = await sails.helpers.getCardsForList(listId, inputs.record.id);
|
const cards = await sails.helpers.getCardsForList(
|
||||||
|
values.listId || inputs.record.listId,
|
||||||
|
inputs.record.id,
|
||||||
|
);
|
||||||
|
|
||||||
const { position, repositions } = sails.helpers.insertToPositionables(values.position, cards);
|
const { position, repositions } = sails.helpers.insertToPositionables(values.position, cards);
|
||||||
|
|
||||||
|
|
|
@ -42,14 +42,19 @@ module.exports = {
|
||||||
required: true,
|
required: true,
|
||||||
columnName: 'card_id',
|
columnName: 'card_id',
|
||||||
},
|
},
|
||||||
|
userId: {
|
||||||
|
model: 'User',
|
||||||
|
required: true,
|
||||||
|
columnName: 'user_id',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
customToJSON() {
|
customToJSON() {
|
||||||
return {
|
return {
|
||||||
..._.omit(this, ['dirname', 'filename', 'isImage']),
|
..._.omit(this, ['dirname', 'filename', 'isImage']),
|
||||||
url: `${sails.config.custom.attachmentsUrl}/${this.dirname}/${this.filename}`,
|
url: `${sails.config.custom.attachmentsUrl}/${this.dirname}/${this.filename}`,
|
||||||
thumbnailUrl: this.isImage
|
coverUrl: this.isImage
|
||||||
? `${sails.config.custom.attachmentsUrl}/${this.dirname}/240.jpg`
|
? `${sails.config.custom.attachmentsUrl}/${this.dirname}/thumbnails/cover-256.jpg`
|
||||||
: null,
|
: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
|
@ -50,6 +50,10 @@ module.exports = {
|
||||||
required: true,
|
required: true,
|
||||||
columnName: 'board_id',
|
columnName: 'board_id',
|
||||||
},
|
},
|
||||||
|
coverAttachmentId: {
|
||||||
|
model: 'Attachment',
|
||||||
|
columnName: 'cover_attachment_id',
|
||||||
|
},
|
||||||
subscriptionUsers: {
|
subscriptionUsers: {
|
||||||
collection: 'User',
|
collection: 'User',
|
||||||
via: 'cardId',
|
via: 'cardId',
|
||||||
|
|
|
@ -94,7 +94,8 @@ module.exports = {
|
||||||
return {
|
return {
|
||||||
..._.omit(this, ['password', 'avatarDirname']),
|
..._.omit(this, ['password', 'avatarDirname']),
|
||||||
avatarUrl:
|
avatarUrl:
|
||||||
this.avatarDirname && `${sails.config.custom.userAvatarsUrl}/${this.avatarDirname}/100.jpg`,
|
this.avatarDirname &&
|
||||||
|
`${sails.config.custom.userAvatarsUrl}/${this.avatarDirname}/square-100.jpg`,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,6 +6,7 @@ module.exports.up = (knex) =>
|
||||||
|
|
||||||
table.bigInteger('list_id').notNullable();
|
table.bigInteger('list_id').notNullable();
|
||||||
table.bigInteger('board_id').notNullable();
|
table.bigInteger('board_id').notNullable();
|
||||||
|
table.bigInteger('cover_attachment_id');
|
||||||
|
|
||||||
table.specificType('position', 'double precision').notNullable();
|
table.specificType('position', 'double precision').notNullable();
|
||||||
table.text('name').notNullable();
|
table.text('name').notNullable();
|
||||||
|
|
|
@ -5,6 +5,7 @@ module.exports.up = (knex) =>
|
||||||
table.bigInteger('id').primary().defaultTo(knex.raw('next_id()'));
|
table.bigInteger('id').primary().defaultTo(knex.raw('next_id()'));
|
||||||
|
|
||||||
table.bigInteger('card_id').notNullable();
|
table.bigInteger('card_id').notNullable();
|
||||||
|
table.bigInteger('user_id').notNullable();
|
||||||
|
|
||||||
table.text('dirname').notNullable();
|
table.text('dirname').notNullable();
|
||||||
table.text('filename').notNullable();
|
table.text('filename').notNullable();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue