Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-19 21:29:43 +02:00
Code Issues Releases Activity

Add scrollbar for board tabs, update dependencies

Browse source
This commit is contained in:
Maksim Eltyshev 2020-06-08 18:49:40 +05:00
parent c4e3c3d4c8
commit 2d92ade8dc
6 changed files with 2576 additions and 2079 deletions
Download patch file Download diff file Expand all files Collapse all files

4372
client/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

8
client/package.json
View file

@ -53,13 +53,13 @@
"history": "^4.10.1", "history": "^4.10.1",
"i18next": "^19.4.5", "i18next": "^19.4.5",
"i18next-browser-languagedetector": "^4.2.0", "i18next-browser-languagedetector": "^4.2.0",
"initials": "^3.0.1", "initials": "^3.1.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^16.13.1", "react": "^16.13.1",
"react-beautiful-dnd": "^13.0.0", "react-beautiful-dnd": "^13.0.0",
"react-datepicker": "^2.16.0", "react-datepicker": "^3.0.0",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-dropzone": "^11.0.1", "react-dropzone": "^11.0.1",
"react-i18next": "^11.5.0", "react-i18next": "^11.5.0",
@ -84,11 +84,11 @@
"eslint": "^6.8.0", "eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0", "eslint-config-airbnb": "^18.1.0",
"eslint-config-prettier": "^6.11.0", "eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.20.2", "eslint-plugin-import": "^2.21.1",
"eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.3", "eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.20.0", "eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^4.0.2", "eslint-plugin-react-hooks": "^4.0.4",
"prettier": "2.0.5" "prettier": "2.0.5"
} }
} }

50
client/src/components/Boards/Boards.jsx
View file

@ -1,5 +1,5 @@
import pick from 'lodash/pick'; import pick from 'lodash/pick';
import React, { useCallback } from 'react'; import React, { useCallback, useRef } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
@ -16,6 +16,14 @@ import styles from './Boards.module.scss';
const Boards = React.memo( const Boards = React.memo(
({ items, currentId, isEditable, onCreate, onUpdate, onMove, onDelete }) => { ({ items, currentId, isEditable, onCreate, onUpdate, onMove, onDelete }) => {
const tabsWrapper = useRef(null);
const handleWheel = useCallback(({ deltaY }) => {
tabsWrapper.current.scrollBy({
left: deltaY,
});
}, []);
const handleDragStart = useCallback(() => { const handleDragStart = useCallback(() => {
closePopup(); closePopup();
}, []); }, []);
@ -115,25 +123,27 @@ const Boards = React.memo(
); );
return ( return (
<div className={styles.wrapper}> <div className={styles.wrapper} onWheel={handleWheel}>
{isEditable ? ( <div ref={tabsWrapper} className={styles.tabsWrapper}>
<DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}> {isEditable ? (
<Droppable droppableId="boards" type={DroppableTypes.BOARD} direction="horizontal"> <DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
{({ innerRef, droppableProps, placeholder }) => ( <Droppable droppableId="boards" type={DroppableTypes.BOARD} direction="horizontal">
// eslint-disable-next-line react/jsx-props-no-spreading {({ innerRef, droppableProps, placeholder }) => (
<div {...droppableProps} ref={innerRef} className={styles.tabs}> // eslint-disable-next-line react/jsx-props-no-spreading
{renderEditableItems(items)} <div {...droppableProps} ref={innerRef} className={styles.tabs}>
{placeholder} {renderEditableItems(items)}
<AddPopup onCreate={onCreate}> {placeholder}
<Button icon="plus" className={styles.addButton} /> <AddPopup onCreate={onCreate}>
</AddPopup> <Button icon="plus" className={styles.addButton} />
</div> </AddPopup>
)} </div>
</Droppable> )}
</DragDropContext> </Droppable>
) : ( </DragDropContext>
<div className={styles.tabs}>{renderItems(items)}</div> ) : (
)} <div className={styles.tabs}>{renderItems(items)}</div>
)}
</div>
</div> </div>
); );
}, },

33
client/src/components/Boards/Boards.module.scss
View file

@ -67,16 +67,47 @@
} }
.tabs { .tabs {
border-bottom: 2px solid rgba(0, 0, 0, 0.24);;
display: flex; display: flex;
height: 38px; height: 38px;
flex: 0 0 auto; flex: 0 0 auto;
white-space: nowrap; white-space: nowrap;
} }
.tabsWrapper {
display: flex;
flex: 0 0 auto;
height: 56px;
overflow-x: auto;
overflow-y: hidden;
scrollbar-width: thin;
&:hover {
height: 38px;
}
&::-webkit-scrollbar {
height: 5px;
}
&::-webkit-scrollbar-track {
background: transparent;
}
&::-webkit-scrollbar-thumb {
border-radius: 3px;
}
}
.wrapper { .wrapper {
border-bottom: 2px solid rgba(0, 0, 0, 0.24);
display: flex; display: flex;
flex: 1 1 auto; flex: 1 1 auto;
flex-direction: column; flex-direction: column;
height: 38px;
overflow: hidden;
&:hover {
border-bottom: 0;
}
} }
} }

186
server/package-lock.json generated
View file

@ -4,27 +4,27 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"dependencies": { "dependencies": {
"@babel/code-frame": { "@babel/code-frame": {
"version": "7.8.3", "version": "7.10.1",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
"integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/highlight": "^7.8.3" "@babel/highlight": "^7.10.1"
} }
}, },
"@babel/helper-validator-identifier": { "@babel/helper-validator-identifier": {
"version": "7.9.5", "version": "7.10.1",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
"integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==", "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
"dev": true "dev": true
}, },
"@babel/highlight": { "@babel/highlight": {
"version": "7.9.0", "version": "7.10.1",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
"integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/helper-validator-identifier": "^7.9.0", "@babel/helper-validator-identifier": "^7.10.1",
"chalk": "^2.0.0", "chalk": "^2.0.0",
"js-tokens": "^4.0.0" "js-tokens": "^4.0.0"
} }
@ -55,6 +55,12 @@
"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
"dev": true "dev": true
}, },
"@types/json5": {
"version": "0.0.29",
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
"dev": true
},
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@ -432,12 +438,12 @@
"integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=" "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY="
}, },
"bcrypt": { "bcrypt": {
"version": "4.0.1", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-4.0.1.tgz", "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz",
"integrity": "sha512-hSIZHkUxIDS5zA2o00Kf2O5RfVbQ888n54xQoF/eIaquU4uaLxK8vhhBdktd0B3n2MjkcAWzv4mnhogykBKOUQ==", "integrity": "sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==",
"requires": { "requires": {
"node-addon-api": "^2.0.0", "node-addon-api": "^3.0.0",
"node-pre-gyp": "0.14.0" "node-pre-gyp": "0.15.0"
} }
}, },
"better-assert": { "better-assert": {
@ -1886,23 +1892,24 @@
} }
}, },
"eslint-plugin-import": { "eslint-plugin-import": {
"version": "2.20.2", "version": "2.21.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.21.1.tgz",
"integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==", "integrity": "sha512-qYOOsgUv63vHof7BqbzuD+Ud34bXHxFJxntuAC1ZappFZXYbRIek3aJ7jc9i2dHDGDyZ/0zlO0cpioES265Lsw==",
"dev": true, "dev": true,
"requires": { "requires": {
"array-includes": "^3.0.3", "array-includes": "^3.1.1",
"array.prototype.flat": "^1.2.1", "array.prototype.flat": "^1.2.3",
"contains-path": "^0.1.0", "contains-path": "^0.1.0",
"debug": "^2.6.9", "debug": "^2.6.9",
"doctrine": "1.5.0", "doctrine": "1.5.0",
"eslint-import-resolver-node": "^0.3.2", "eslint-import-resolver-node": "^0.3.3",
"eslint-module-utils": "^2.4.1", "eslint-module-utils": "^2.6.0",
"has": "^1.0.3", "has": "^1.0.3",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"object.values": "^1.1.0", "object.values": "^1.1.1",
"read-pkg-up": "^2.0.0", "read-pkg-up": "^2.0.0",
"resolve": "^1.12.0" "resolve": "^1.17.0",
"tsconfig-paths": "^3.9.0"
}, },
"dependencies": { "dependencies": {
"debug": { "debug": {
@ -1942,9 +1949,9 @@
} }
}, },
"eslint-scope": { "eslint-scope": {
"version": "5.0.0", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
"integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
"dev": true, "dev": true,
"requires": { "requires": {
"esrecurse": "^4.1.0", "esrecurse": "^4.1.0",
@ -1961,9 +1968,9 @@
} }
}, },
"eslint-visitor-keys": { "eslint-visitor-keys": {
"version": "1.1.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz",
"integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", "integrity": "sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==",
"dev": true "dev": true
}, },
"esm": { "esm": {
@ -2347,9 +2354,9 @@
"integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=" "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A="
}, },
"fast-deep-equal": { "fast-deep-equal": {
"version": "3.1.1", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true "dev": true
}, },
"fast-diff": { "fast-diff": {
@ -3190,9 +3197,9 @@
} }
}, },
"interpret": { "interpret": {
"version": "2.0.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-2.0.0.tgz", "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
"integrity": "sha512-e0/LknJ8wpMMhTiWcjivB+ESwIuvHnBSlBbmP/pSb8CQJldoj1p2qv7xGZ/+BtbTziYRFSz8OsvdbiX45LtYQA==" "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="
}, },
"ipaddr.js": { "ipaddr.js": {
"version": "1.9.1", "version": "1.9.1",
@ -3261,9 +3268,9 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
}, },
"is-callable": { "is-callable": {
"version": "1.1.5", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
}, },
"is-ci": { "is-ci": {
"version": "2.0.0", "version": "2.0.0",
@ -3428,11 +3435,11 @@
"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
}, },
"is-regex": { "is-regex": {
"version": "1.0.5", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
"requires": { "requires": {
"has": "^1.0.3" "has-symbols": "^1.0.1"
} }
}, },
"is-relative": { "is-relative": {
@ -3571,6 +3578,15 @@
"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
"dev": true "dev": true
}, },
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"jsonfile": { "jsonfile": {
"version": "2.4.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
@ -3734,9 +3750,9 @@
} }
}, },
"localforage": { "localforage": {
"version": "1.7.3", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/localforage/-/localforage-1.7.3.tgz", "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.7.4.tgz",
"integrity": "sha512-1TulyYfc4udS7ECSBT2vwJksWbkwwTX8BzeUIiq8Y07Riy7bDAAnxDaPU/tWyOVmQAcWJIEIFP9lPfBGqVoPgQ==", "integrity": "sha512-3EmVZatmNVeCo/t6Te7P06h2alGwbq8wXlSkcSXMvDE2/edPmsVqTPlzGnZaqwZZDBs6v+kxWpqjVsqsNJT8jA==",
"requires": { "requires": {
"lie": "3.1.1" "lie": "3.1.1"
} }
@ -4211,26 +4227,26 @@
"dev": true "dev": true
}, },
"node-abi": { "node-abi": {
"version": "2.17.0", "version": "2.18.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.17.0.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz",
"integrity": "sha512-dFRAA0ACk/aBo0TIXQMEWMLUTyWYYT8OBYIzLmEUrQTElGRjxDCvyBZIsDL0QA7QCaj9PrawhOmTEdsuLY4uOQ==", "integrity": "sha512-yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw==",
"requires": { "requires": {
"semver": "^5.4.1" "semver": "^5.4.1"
} }
}, },
"node-addon-api": { "node-addon-api": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz",
"integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" "integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg=="
}, },
"node-pre-gyp": { "node-pre-gyp": {
"version": "0.14.0", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz",
"integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==",
"requires": { "requires": {
"detect-libc": "^1.0.2", "detect-libc": "^1.0.2",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.3",
"needle": "^2.2.1", "needle": "^2.5.0",
"nopt": "^4.0.1", "nopt": "^4.0.1",
"npm-packlist": "^1.1.6", "npm-packlist": "^1.1.6",
"npmlog": "^4.0.2", "npmlog": "^4.0.2",
@ -5542,12 +5558,13 @@
} }
}, },
"sails-disk": { "sails-disk": {
"version": "1.1.2", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/sails-disk/-/sails-disk-1.1.2.tgz", "resolved": "https://registry.npmjs.org/sails-disk/-/sails-disk-2.1.0.tgz",
"integrity": "sha512-zdOUzgKUQizvwtanZ4UMFU19NJA4QgGc9idRrCE6AYbo4UQ4E1PoY2GarRZ/SSonG7FSpfnHKt4O7C5pC+VKxQ==", "integrity": "sha512-GBUxSEjFkq79kIVQtMEEHo8JIm/S9WPwzrIy8wrR4sPW3bkwwSkr+Vl35o08/rVWmZ8hUS8+eDM5rQHdWF6ebw==",
"requires": { "requires": {
"@sailshq/lodash": "^3.10.2", "@sailshq/lodash": "^3.10.2",
"async": "2.0.1", "async": "2.0.1",
"flaverr": "^1.10.0",
"machinepack-fs": "^12.0.1", "machinepack-fs": "^12.0.1",
"nedb": "1.8.0" "nedb": "1.8.0"
}, },
@ -5620,9 +5637,9 @@
} }
}, },
"sails-hook-orm": { "sails-hook-orm": {
"version": "2.1.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/sails-hook-orm/-/sails-hook-orm-2.1.1.tgz", "resolved": "https://registry.npmjs.org/sails-hook-orm/-/sails-hook-orm-3.0.1.tgz",
"integrity": "sha512-O6BqlAOpsomXDo6aJyZtmWNn2NwKvONZEFEy5tMhuP682HRxZ40p4iWLz0mkLzAfonpcCr91YoXCXqlWzLkpEA==", "integrity": "sha512-PF/b3Rv0YN8dgkyBEQvtknOH2rPX2zi4t6RDFA7kN5hJ9amZiE7NfEOrT69me1N6XLcvIjCyIvQpmfBEjmIFKw==",
"requires": { "requires": {
"@sailshq/lodash": "^3.10.2", "@sailshq/lodash": "^3.10.2",
"async": "2.0.1", "async": "2.0.1",
@ -5630,8 +5647,8 @@
"flaverr": "^1.8.0", "flaverr": "^1.8.0",
"parley": "^3.3.2", "parley": "^3.3.2",
"prompt": "0.2.14", "prompt": "0.2.14",
"sails-disk": "^1.0.0-0", "sails-disk": "^2.0.0",
"waterline": "^0.13.5-0", "waterline": "^0.14.0-0",
"waterline-utils": "^1.0.0" "waterline-utils": "^1.0.0"
}, },
"dependencies": { "dependencies": {
@ -5946,11 +5963,6 @@
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
}, },
"node-addon-api": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz",
"integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg=="
},
"semver": { "semver": {
"version": "7.3.2", "version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
@ -6802,6 +6814,18 @@
"escape-string-regexp": "^1.0.2" "escape-string-regexp": "^1.0.2"
} }
}, },
"tsconfig-paths": {
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
"integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
"dev": true,
"requires": {
"@types/json5": "^0.0.29",
"json5": "^1.0.1",
"minimist": "^1.2.0",
"strip-bom": "^3.0.0"
}
},
"tslib": { "tslib": {
"version": "1.13.0", "version": "1.13.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
@ -7114,15 +7138,15 @@
"integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==" "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
}, },
"v8-compile-cache": { "v8-compile-cache": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
"integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
"dev": true "dev": true
}, },
"v8flags": { "v8flags": {
"version": "3.1.3", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
"integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==", "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
"requires": { "requires": {
"homedir-polyfill": "^1.0.1" "homedir-polyfill": "^1.0.1"
} }
@ -7156,15 +7180,15 @@
} }
}, },
"waterline": { "waterline": {
"version": "0.13.6", "version": "0.14.0-5",
"resolved": "https://registry.npmjs.org/waterline/-/waterline-0.13.6.tgz", "resolved": "https://registry.npmjs.org/waterline/-/waterline-0.14.0-5.tgz",
"integrity": "sha512-FnJqjGzhwX2vnk2GPa4SsME28zqDdf8PZzXjbkiBpb5flE4AOl/rgxB8OuG7wXBRKKQtG0hqvJIsJwdoWFdXJw==", "integrity": "sha512-UMeHWG6RT4FulGJDA+yK+Aji4Xxat5ZudJy26A4bh/aXRaiJdGgCUs9mPtLfFp4Ci9cJDLBsVC15trWMY1AV2w==",
"requires": { "requires": {
"@sailshq/lodash": "^3.10.2", "@sailshq/lodash": "^3.10.2",
"anchor": "^1.2.0", "anchor": "^1.2.0",
"async": "2.0.1", "async": "2.0.1",
"encrypted-attr": "1.0.6", "encrypted-attr": "1.0.6",
"flaverr": "^1.8.3", "flaverr": "^1.9.2",
"lodash.issafeinteger": "4.0.4", "lodash.issafeinteger": "4.0.4",
"parley": "^3.3.2", "parley": "^3.3.2",
"rttc": "^10.0.0-1", "rttc": "^10.0.0-1",

6
server/package.json
View file

@ -39,7 +39,7 @@
} }
}, },
"dependencies": { "dependencies": {
"bcrypt": "^4.0.1", "bcrypt": "^5.0.0",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"dotenv-cli": "^3.1.0", "dotenv-cli": "^3.1.0",
"filenamify": "^4.1.0", "filenamify": "^4.1.0",
@ -49,7 +49,7 @@
"moment": "^2.26.0", "moment": "^2.26.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"sails": "^1.2.4", "sails": "^1.2.4",
"sails-hook-orm": "^2.1.1", "sails-hook-orm": "^3.0.1",
"sails-hook-sockets": "^2.0.0", "sails-hook-sockets": "^2.0.0",
"sails-postgresql": "^1.0.2", "sails-postgresql": "^1.0.2",
"sharp": "^0.25.3", "sharp": "^0.25.3",
@ -61,7 +61,7 @@
"eslint": "^6.8.0", "eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0", "eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.11.0", "eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.20.2", "eslint-plugin-import": "^2.21.1",
"eslint-plugin-prettier": "^3.1.3", "eslint-plugin-prettier": "^3.1.3",
"nodemon": "^2.0.4", "nodemon": "^2.0.4",
"prettier": "2.0.5" "prettier": "2.0.5"