mirror of
https://github.com/plankanban/planka.git
synced 2025-12-14 17:23:40 +03:00
Compare commits
23 Commits
v1.23.0
...
planka-0.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7580afdb1c | ||
|
|
2458709031 | ||
|
|
e0d5d7f4ff | ||
|
|
bedd1f6e2a | ||
|
|
d9464dc3f9 | ||
|
|
87c1eeb5f8 | ||
|
|
98413d759a | ||
|
|
fa3b1d7b28 | ||
|
|
23e5f1a326 | ||
|
|
de44b520af | ||
|
|
e7d7425768 | ||
|
|
df7746f896 | ||
|
|
01a7e3a57d | ||
|
|
234bd1e8b3 | ||
|
|
2173c3657c | ||
|
|
a2b81f6d59 | ||
|
|
1948bd4fbe | ||
|
|
52f8abc1f8 | ||
|
|
dd7574f134 | ||
|
|
19935e52af | ||
|
|
89292356db | ||
|
|
5f6528fa42 | ||
|
|
2081b44874 |
@@ -4,7 +4,6 @@ on:
|
|||||||
release:
|
release:
|
||||||
types: [created]
|
types: [created]
|
||||||
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-publish-release-package:
|
build-and-publish-release-package:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -48,10 +47,10 @@ jobs:
|
|||||||
- name: Dist create .zip file
|
- name: Dist create .zip file
|
||||||
run: |
|
run: |
|
||||||
mv dist/ planka/
|
mv dist/ planka/
|
||||||
zip -r planka-prebuild-${{ github.event.release.tag_name }}.zip planka
|
zip -r planka-prebuild.zip planka
|
||||||
|
|
||||||
- name: Dist upload assets
|
- name: Dist upload assets
|
||||||
run: |
|
run: |
|
||||||
gh release upload ${{ github.event.release.tag_name }} planka-prebuild-${{ github.event.release.tag_name }}.zip
|
gh release upload ${{ github.event.release.tag_name }} planka-prebuild.zip
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ github.token }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
73
.github/workflows/build-and-test.yml
vendored
Normal file
73
.github/workflows/build-and-test.yml
vendored
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
name: Build and test
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
setup:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
POSTGRES_DB: planka_db
|
||||||
|
POSTGRES_USER: user
|
||||||
|
POSTGRES_PASSWORD: password
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 18
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Setup PostgreSQL
|
||||||
|
uses: ikalnytskyi/action-setup-postgres@v5
|
||||||
|
with:
|
||||||
|
database: ${{ env.POSTGRES_DB }}
|
||||||
|
username: ${{ env.POSTGRES_USER }}
|
||||||
|
password: ${{ env.POSTGRES_PASSWORD }}
|
||||||
|
|
||||||
|
- name: Cache Node.js modules
|
||||||
|
uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: client/node_modules
|
||||||
|
key: ${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-node-
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
npm install
|
||||||
|
cd client
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
- name: Setup server
|
||||||
|
env:
|
||||||
|
DEFAULT_ADMIN_EMAIL: demo@demo.demo
|
||||||
|
DEFAULT_ADMIN_PASSWORD: demo
|
||||||
|
DEFAULT_ADMIN_NAME: Demo Demo
|
||||||
|
DEFAULT_ADMIN_USERNAME: demo
|
||||||
|
run: |
|
||||||
|
client/tests/setup-symlinks.sh
|
||||||
|
cd server
|
||||||
|
cp .env.sample .env
|
||||||
|
sed -i "s|^DATABASE_URL=.*|DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost/${POSTGRES_DB}|" .env
|
||||||
|
npm run db:init
|
||||||
|
npm start --prod &
|
||||||
|
|
||||||
|
- name: Wait for development server
|
||||||
|
run: |
|
||||||
|
sudo apt-get install wait-for-it -y
|
||||||
|
wait-for-it -h localhost -p 1337 -t 10
|
||||||
|
|
||||||
|
- name: Run UI tests
|
||||||
|
run: |
|
||||||
|
cd client
|
||||||
|
npm install
|
||||||
|
npx playwright install chromium
|
||||||
|
npm run test:acceptance tests
|
||||||
33
.github/workflows/lint.yml
vendored
Normal file
33
.github/workflows/lint.yml
vendored
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
name: Lint
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
setup:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 18
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Cache Node.js modules
|
||||||
|
uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: client/node_modules
|
||||||
|
key: ${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-node-
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm install
|
||||||
|
|
||||||
|
- name: Run linter
|
||||||
|
run: npm run lint
|
||||||
@@ -25,6 +25,14 @@ There are many ways to install Planka, [check them out](https://docs.planka.clou
|
|||||||
|
|
||||||
For configuration, please see the [configuration section](https://docs.planka.cloud/docs/category/configuration).
|
For configuration, please see the [configuration section](https://docs.planka.cloud/docs/category/configuration).
|
||||||
|
|
||||||
|
## Mobile app
|
||||||
|
|
||||||
|
Here is the [mobile app repository](https://github.com/LouisHDev/planka_app) maintained by the community, where you can build an app for iOS and Android.
|
||||||
|
|
||||||
|
Alternatively, you can download the [Android APK](https://github.com/LouisHDev/planka_app/releases/latest/download/app-release.apk) directly.
|
||||||
|
|
||||||
|
If you have an iOS device and would like to test the app, you can join [TestFlight](https://testflight.apple.com/join/Uwn41eY4) (limited to 200 participants).
|
||||||
|
|
||||||
## Contact
|
## Contact
|
||||||
|
|
||||||
- If you want to get a hosted version of Planka, you can contact us via email contact@planka.cloud
|
- If you want to get a hosted version of Planka, you can contact us via email contact@planka.cloud
|
||||||
|
|||||||
@@ -15,13 +15,13 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.2.8
|
version: 0.2.12
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# 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.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: "1.22.0"
|
appVersion: "1.23.3"
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- alias: postgresql
|
- alias: postgresql
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ metadata:
|
|||||||
name: {{ include "planka.fullname" . }}
|
name: {{ include "planka.fullname" . }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "planka.labels" . | nindent 4 }}
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
{{- with .Values.service.annotations }}
|
||||||
|
annotations:
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
type: {{ .Values.service.type }}
|
type: {{ .Values.service.type }}
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ securityContext: {}
|
|||||||
# runAsUser: 1000
|
# runAsUser: 1000
|
||||||
|
|
||||||
service:
|
service:
|
||||||
|
annotations: {}
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
port: 1337
|
port: 1337
|
||||||
## @param service.containerPort Planka HTTP container port
|
## @param service.containerPort Planka HTTP container port
|
||||||
|
|||||||
941
client/package-lock.json
generated
941
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -6,7 +6,8 @@
|
|||||||
"eject": "react-scripts eject",
|
"eject": "react-scripts eject",
|
||||||
"lint": "eslint --ext js,jsx src config-overrides.js",
|
"lint": "eslint --ext js,jsx src config-overrides.js",
|
||||||
"start": "react-app-rewired start",
|
"start": "react-app-rewired start",
|
||||||
"test": "react-app-rewired test"
|
"test": "react-app-rewired test",
|
||||||
|
"test:acceptance": "cucumber-js --require tests/acceptance/cucumber.conf.js --require tests/acceptance/stepDefinitions/**/*.js --format @cucumber/pretty-formatter"
|
||||||
},
|
},
|
||||||
"browserslist": {
|
"browserslist": {
|
||||||
"production": [
|
"production": [
|
||||||
@@ -108,9 +109,13 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
|
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
|
||||||
|
"@cucumber/cucumber": "^7.3.1",
|
||||||
|
"@cucumber/pretty-formatter": "^1.0.1",
|
||||||
|
"@playwright/test": "^1.46.1",
|
||||||
"@testing-library/jest-dom": "^6.5.0",
|
"@testing-library/jest-dom": "^6.5.0",
|
||||||
"@testing-library/react": "^15.0.7",
|
"@testing-library/react": "^15.0.7",
|
||||||
"@testing-library/user-event": "^14.5.2",
|
"@testing-library/user-event": "^14.5.2",
|
||||||
|
"axios": "^1.6.2",
|
||||||
"babel-preset-airbnb": "^5.0.0",
|
"babel-preset-airbnb": "^5.0.0",
|
||||||
"chai": "^4.5.0",
|
"chai": "^4.5.0",
|
||||||
"eslint": "^8.57.0",
|
"eslint": "^8.57.0",
|
||||||
@@ -119,6 +124,7 @@
|
|||||||
"eslint-plugin-jsx-a11y": "^6.10.0",
|
"eslint-plugin-jsx-a11y": "^6.10.0",
|
||||||
"eslint-plugin-react": "^7.36.1",
|
"eslint-plugin-react": "^7.36.1",
|
||||||
"eslint-plugin-react-hooks": "^4.6.2",
|
"eslint-plugin-react-hooks": "^4.6.2",
|
||||||
|
"playwright": "^1.46.1",
|
||||||
"react-test-renderer": "18.2.0"
|
"react-test-renderer": "18.2.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ const Card = React.memo(
|
|||||||
id,
|
id,
|
||||||
index,
|
index,
|
||||||
name,
|
name,
|
||||||
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
isDueDateCompleted,
|
isDueDateCompleted,
|
||||||
stopwatch,
|
stopwatch,
|
||||||
@@ -31,6 +32,7 @@ const Card = React.memo(
|
|||||||
listId,
|
listId,
|
||||||
projectId,
|
projectId,
|
||||||
isPersisted,
|
isPersisted,
|
||||||
|
attachmentsTotal,
|
||||||
notificationsTotal,
|
notificationsTotal,
|
||||||
users,
|
users,
|
||||||
labels,
|
labels,
|
||||||
@@ -106,7 +108,11 @@ const Card = React.memo(
|
|||||||
)}
|
)}
|
||||||
<div className={styles.name}>{name}</div>
|
<div className={styles.name}>{name}</div>
|
||||||
{tasks.length > 0 && <Tasks items={tasks} />}
|
{tasks.length > 0 && <Tasks items={tasks} />}
|
||||||
{(dueDate || stopwatch || notificationsTotal > 0) && (
|
{(description ||
|
||||||
|
dueDate ||
|
||||||
|
stopwatch ||
|
||||||
|
attachmentsTotal > 0 ||
|
||||||
|
notificationsTotal > 0) && (
|
||||||
<span className={styles.attachments}>
|
<span className={styles.attachments}>
|
||||||
{notificationsTotal > 0 && (
|
{notificationsTotal > 0 && (
|
||||||
<span
|
<span
|
||||||
@@ -135,6 +141,21 @@ const Card = React.memo(
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
|
{description && (
|
||||||
|
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
||||||
|
<span className={styles.attachmentContent}>
|
||||||
|
<Icon name="align left" />
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{attachmentsTotal > 0 && (
|
||||||
|
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
||||||
|
<span className={styles.attachmentContent}>
|
||||||
|
<Icon name="attach" />
|
||||||
|
{attachmentsTotal}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{users.length > 0 && (
|
{users.length > 0 && (
|
||||||
@@ -221,6 +242,7 @@ Card.propTypes = {
|
|||||||
id: PropTypes.string.isRequired,
|
id: PropTypes.string.isRequired,
|
||||||
index: PropTypes.number.isRequired,
|
index: PropTypes.number.isRequired,
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
|
description: PropTypes.string,
|
||||||
dueDate: PropTypes.instanceOf(Date),
|
dueDate: PropTypes.instanceOf(Date),
|
||||||
isDueDateCompleted: PropTypes.bool,
|
isDueDateCompleted: PropTypes.bool,
|
||||||
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
@@ -229,6 +251,7 @@ Card.propTypes = {
|
|||||||
listId: PropTypes.string.isRequired,
|
listId: PropTypes.string.isRequired,
|
||||||
projectId: PropTypes.string.isRequired,
|
projectId: PropTypes.string.isRequired,
|
||||||
isPersisted: PropTypes.bool.isRequired,
|
isPersisted: PropTypes.bool.isRequired,
|
||||||
|
attachmentsTotal: PropTypes.number.isRequired,
|
||||||
notificationsTotal: PropTypes.number.isRequired,
|
notificationsTotal: PropTypes.number.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
users: PropTypes.array.isRequired,
|
users: PropTypes.array.isRequired,
|
||||||
@@ -256,6 +279,7 @@ Card.propTypes = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Card.defaultProps = {
|
Card.defaultProps = {
|
||||||
|
description: undefined,
|
||||||
dueDate: undefined,
|
dueDate: undefined,
|
||||||
isDueDateCompleted: undefined,
|
isDueDateCompleted: undefined,
|
||||||
stopwatch: undefined,
|
stopwatch: undefined,
|
||||||
|
|||||||
@@ -39,6 +39,13 @@
|
|||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.attachmentContent {
|
||||||
|
color: #6a808b;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 20px;
|
||||||
|
padding: 0px 3px;
|
||||||
|
}
|
||||||
|
|
||||||
.attachmentLeft {
|
.attachmentLeft {
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ const AttachmentAddStep = React.memo(({ onCreate, onClose }) => {
|
|||||||
</Popup.Header>
|
</Popup.Header>
|
||||||
<Popup.Content>
|
<Popup.Content>
|
||||||
<Menu secondary vertical className={styles.menu}>
|
<Menu secondary vertical className={styles.menu}>
|
||||||
<FilePicker onSelect={handleFileSelect}>
|
<FilePicker multiple onSelect={handleFileSelect}>
|
||||||
<Menu.Item className={styles.menuItem}>
|
<Menu.Item className={styles.menuItem}>
|
||||||
{t('common.fromComputer', {
|
{t('common.fromComputer', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import { closePopup } from '../../../lib/popup';
|
import { closePopup } from '../../../lib/popup';
|
||||||
|
|
||||||
import { useModal } from '../../../hooks';
|
import { useModal } from '../../../hooks';
|
||||||
|
import { isActiveTextElement } from '../../../utils/element-helpers';
|
||||||
import TextFileAddModal from './TextFileAddModal';
|
import TextFileAddModal from './TextFileAddModal';
|
||||||
|
|
||||||
import styles from './AttachmentAddZone.module.scss';
|
import styles from './AttachmentAddZone.module.scss';
|
||||||
@@ -24,13 +25,14 @@ const AttachmentAddZone = React.memo(({ children, onCreate }) => {
|
|||||||
|
|
||||||
const handleDropAccepted = useCallback(
|
const handleDropAccepted = useCallback(
|
||||||
(files) => {
|
(files) => {
|
||||||
submit(files[0]);
|
files.forEach((file) => {
|
||||||
|
submit(file);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
[submit],
|
[submit],
|
||||||
);
|
);
|
||||||
|
|
||||||
const { getRootProps, getInputProps, isDragActive } = useDropzone({
|
const { getRootProps, getInputProps, isDragActive } = useDropzone({
|
||||||
multiple: false,
|
|
||||||
noClick: true,
|
noClick: true,
|
||||||
noKeyboard: true,
|
noKeyboard: true,
|
||||||
onDropAccepted: handleDropAccepted,
|
onDropAccepted: handleDropAccepted,
|
||||||
@@ -49,38 +51,43 @@ const AttachmentAddZone = React.memo(({ children, onCreate }) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const file = event.clipboardData.files[0];
|
const { files, items } = event.clipboardData;
|
||||||
|
|
||||||
if (file) {
|
if (files.length > 0) {
|
||||||
submit(file);
|
[...files].forEach((file) => {
|
||||||
return;
|
submit(file);
|
||||||
}
|
|
||||||
|
|
||||||
const item = event.clipboardData.items[0];
|
|
||||||
|
|
||||||
if (!item) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (item.kind === 'file') {
|
|
||||||
submit(item.getAsFile());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
['input', 'textarea'].includes(event.target.tagName.toLowerCase()) &&
|
|
||||||
event.target === document.activeElement
|
|
||||||
) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
closePopup();
|
|
||||||
event.preventDefault();
|
|
||||||
|
|
||||||
item.getAsString((content) => {
|
|
||||||
openModal({
|
|
||||||
content,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (items.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (items[0].kind === 'string') {
|
||||||
|
if (isActiveTextElement(event.target)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
closePopup();
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
|
items[0].getAsString((content) => {
|
||||||
|
openModal({
|
||||||
|
content,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
[...items].forEach((item) => {
|
||||||
|
if (item.kind !== 'file') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
submit(item.getAsFile());
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -369,7 +369,7 @@ const CardModal = React.memo(
|
|||||||
{(description || canEdit) && (
|
{(description || canEdit) && (
|
||||||
<div className={styles.contentModule}>
|
<div className={styles.contentModule}>
|
||||||
<div className={styles.moduleWrapper}>
|
<div className={styles.moduleWrapper}>
|
||||||
<Icon name="align justify" className={styles.moduleIcon} />
|
<Icon name="align left" className={styles.moduleIcon} />
|
||||||
<div className={styles.moduleHeader}>{t('common.description')}</div>
|
<div className={styles.moduleHeader}>{t('common.description')}</div>
|
||||||
{canEdit ? (
|
{canEdit ? (
|
||||||
<DescriptionEdit defaultValue={description} onUpdate={handleDescriptionUpdate}>
|
<DescriptionEdit defaultValue={description} onUpdate={handleDescriptionUpdate}>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { useDidUpdate, useToggle } from '../../lib/hooks';
|
|||||||
import { Input, Popup } from '../../lib/custom-ui';
|
import { Input, Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useForm } from '../../hooks';
|
import { useForm } from '../../hooks';
|
||||||
|
import parseTime from '../../utils/parse-time';
|
||||||
|
|
||||||
import styles from './DueDateEditStep.module.scss';
|
import styles from './DueDateEditStep.module.scss';
|
||||||
|
|
||||||
@@ -66,10 +67,7 @@ const DueDateEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose })
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const value = t('format:dateTime', {
|
const value = parseTime(data.time, nullableDate);
|
||||||
postProcess: 'parseDate',
|
|
||||||
value: `${data.date} ${data.time}`,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (Number.isNaN(value.getTime())) {
|
if (Number.isNaN(value.getTime())) {
|
||||||
timeField.current.select();
|
timeField.current.select();
|
||||||
@@ -81,7 +79,7 @@ const DueDateEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose })
|
|||||||
}
|
}
|
||||||
|
|
||||||
onClose();
|
onClose();
|
||||||
}, [defaultValue, onUpdate, onClose, data, nullableDate, t]);
|
}, [defaultValue, onUpdate, onClose, data, nullableDate]);
|
||||||
|
|
||||||
const handleClearClick = useCallback(() => {
|
const handleClearClick = useCallback(() => {
|
||||||
if (defaultValue) {
|
if (defaultValue) {
|
||||||
|
|||||||
@@ -20,12 +20,22 @@ const makeMapStateToProps = () => {
|
|||||||
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
||||||
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const { name, dueDate, isDueDateCompleted, stopwatch, coverUrl, boardId, listId, isPersisted } =
|
const {
|
||||||
selectCardById(state, id);
|
name,
|
||||||
|
description,
|
||||||
|
dueDate,
|
||||||
|
isDueDateCompleted,
|
||||||
|
stopwatch,
|
||||||
|
coverUrl,
|
||||||
|
boardId,
|
||||||
|
listId,
|
||||||
|
isPersisted,
|
||||||
|
} = selectCardById(state, id);
|
||||||
|
|
||||||
const users = selectUsersByCardId(state, id);
|
const users = selectUsersByCardId(state, id);
|
||||||
const labels = selectLabelsByCardId(state, id);
|
const labels = selectLabelsByCardId(state, id);
|
||||||
const tasks = selectTasksByCardId(state, id);
|
const tasks = selectTasksByCardId(state, id);
|
||||||
|
const attachmentsTotal = selectors.selectAttachmentsTotalByCardId(state, id);
|
||||||
const notificationsTotal = selectNotificationsTotalByCardId(state, id);
|
const notificationsTotal = selectNotificationsTotalByCardId(state, id);
|
||||||
|
|
||||||
const isCurrentUserEditor =
|
const isCurrentUserEditor =
|
||||||
@@ -35,6 +45,7 @@ const makeMapStateToProps = () => {
|
|||||||
id,
|
id,
|
||||||
index,
|
index,
|
||||||
name,
|
name,
|
||||||
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
isDueDateCompleted,
|
isDueDateCompleted,
|
||||||
stopwatch,
|
stopwatch,
|
||||||
@@ -43,6 +54,7 @@ const makeMapStateToProps = () => {
|
|||||||
listId,
|
listId,
|
||||||
projectId,
|
projectId,
|
||||||
isPersisted,
|
isPersisted,
|
||||||
|
attachmentsTotal,
|
||||||
notificationsTotal,
|
notificationsTotal,
|
||||||
users,
|
users,
|
||||||
labels,
|
labels,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
|
|||||||
|
|
||||||
import styles from './FilePicker.module.css';
|
import styles from './FilePicker.module.css';
|
||||||
|
|
||||||
const FilePicker = React.memo(({ children, accept, onSelect }) => {
|
const FilePicker = React.memo(({ children, accept, multiple, onSelect }) => {
|
||||||
const field = useRef(null);
|
const field = useRef(null);
|
||||||
|
|
||||||
const handleTriggerClick = useCallback(() => {
|
const handleTriggerClick = useCallback(() => {
|
||||||
@@ -12,11 +12,11 @@ const FilePicker = React.memo(({ children, accept, onSelect }) => {
|
|||||||
|
|
||||||
const handleFieldChange = useCallback(
|
const handleFieldChange = useCallback(
|
||||||
({ target }) => {
|
({ target }) => {
|
||||||
if (target.files[0]) {
|
[...target.files].forEach((file) => {
|
||||||
onSelect(target.files[0]);
|
onSelect(file);
|
||||||
|
});
|
||||||
|
|
||||||
target.value = null; // eslint-disable-line no-param-reassign
|
target.value = null; // eslint-disable-line no-param-reassign
|
||||||
}
|
|
||||||
},
|
},
|
||||||
[onSelect],
|
[onSelect],
|
||||||
);
|
);
|
||||||
@@ -32,6 +32,7 @@ const FilePicker = React.memo(({ children, accept, onSelect }) => {
|
|||||||
ref={field}
|
ref={field}
|
||||||
type="file"
|
type="file"
|
||||||
accept={accept}
|
accept={accept}
|
||||||
|
multiple={multiple}
|
||||||
className={styles.field}
|
className={styles.field}
|
||||||
onChange={handleFieldChange}
|
onChange={handleFieldChange}
|
||||||
/>
|
/>
|
||||||
@@ -42,11 +43,13 @@ const FilePicker = React.memo(({ children, accept, onSelect }) => {
|
|||||||
FilePicker.propTypes = {
|
FilePicker.propTypes = {
|
||||||
children: PropTypes.element.isRequired,
|
children: PropTypes.element.isRequired,
|
||||||
accept: PropTypes.string,
|
accept: PropTypes.string,
|
||||||
|
multiple: PropTypes.bool,
|
||||||
onSelect: PropTypes.func.isRequired,
|
onSelect: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
FilePicker.defaultProps = {
|
FilePicker.defaultProps = {
|
||||||
accept: undefined,
|
accept: undefined,
|
||||||
|
multiple: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default FilePicker;
|
export default FilePicker;
|
||||||
|
|||||||
253
client/src/locales/en-GB/core.js
Normal file
253
client/src/locales/en-GB/core.js
Normal file
@@ -0,0 +1,253 @@
|
|||||||
|
import dateFns from 'date-fns/locale/en-GB';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
dateFns,
|
||||||
|
|
||||||
|
format: {
|
||||||
|
date: 'P',
|
||||||
|
time: 'p',
|
||||||
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
|
longDate: 'd MMM',
|
||||||
|
longDateTime: "d MMMM 'at' p",
|
||||||
|
fullDate: 'd MMM y',
|
||||||
|
fullDateTime: "d MMMM y 'at' p",
|
||||||
|
},
|
||||||
|
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
aboutPlanka: 'About Planka',
|
||||||
|
account: 'Account',
|
||||||
|
actions: 'Actions',
|
||||||
|
addAttachment_title: 'Add Attachment',
|
||||||
|
addComment: 'Add comment',
|
||||||
|
addManager_title: 'Add Manager',
|
||||||
|
addMember_title: 'Add Member',
|
||||||
|
addUser_title: 'Add User',
|
||||||
|
administrator: 'Administrator',
|
||||||
|
all: 'All',
|
||||||
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
|
'All changes will be automatically saved<br />after connection restored.',
|
||||||
|
areYouSureYouWantToDeleteThisAttachment: 'Are you sure you want to delete this attachment?',
|
||||||
|
areYouSureYouWantToDeleteThisBoard: 'Are you sure you want to delete this board?',
|
||||||
|
areYouSureYouWantToDeleteThisCard: 'Are you sure you want to delete this card?',
|
||||||
|
areYouSureYouWantToDeleteThisComment: 'Are you sure you want to delete this comment?',
|
||||||
|
areYouSureYouWantToDeleteThisLabel: 'Are you sure you want to delete this label?',
|
||||||
|
areYouSureYouWantToDeleteThisList: 'Are you sure you want to delete this list?',
|
||||||
|
areYouSureYouWantToDeleteThisProject: 'Are you sure you want to delete this project?',
|
||||||
|
areYouSureYouWantToDeleteThisTask: 'Are you sure you want to delete this task?',
|
||||||
|
areYouSureYouWantToDeleteThisUser: 'Are you sure you want to delete this user?',
|
||||||
|
areYouSureYouWantToLeaveBoard: 'Are you sure you want to leave the board?',
|
||||||
|
areYouSureYouWantToLeaveProject: 'Are you sure you want to leave the project?',
|
||||||
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
|
'Are you sure you want to remove this manager from the project?',
|
||||||
|
areYouSureYouWantToRemoveThisMemberFromBoard:
|
||||||
|
'Are you sure you want to remove this member from the board?',
|
||||||
|
attachment: 'Attachment',
|
||||||
|
attachments: 'Attachments',
|
||||||
|
authentication: 'Authentication',
|
||||||
|
background: 'Background',
|
||||||
|
board: 'Board',
|
||||||
|
boardNotFound_title: 'Board Not Found',
|
||||||
|
canComment: 'Can comment',
|
||||||
|
canEditContentOfBoard: 'Can edit the content of the board.',
|
||||||
|
canOnlyViewBoard: 'Can only view the board.',
|
||||||
|
cardActions_title: 'Card Actions',
|
||||||
|
cardNotFound_title: 'Card Not Found',
|
||||||
|
cardOrActionAreDeleted: 'Card or action are deleted.',
|
||||||
|
color: 'Color',
|
||||||
|
copy_inline: 'copy',
|
||||||
|
createBoard_title: 'Create Board',
|
||||||
|
createLabel_title: 'Create Label',
|
||||||
|
createNewOneOrSelectExistingOne: 'Create a new one or select<br />an existing one.',
|
||||||
|
createProject_title: 'Create Project',
|
||||||
|
createTextFile_title: 'Create Text File',
|
||||||
|
currentPassword: 'Current password',
|
||||||
|
dangerZone_title: 'Danger Zone',
|
||||||
|
date: 'Date',
|
||||||
|
dueDate: 'Due date',
|
||||||
|
dueDate_title: 'Due Date',
|
||||||
|
deleteAttachment_title: 'Delete Attachment',
|
||||||
|
deleteBoard_title: 'Delete Board',
|
||||||
|
deleteCard_title: 'Delete Card',
|
||||||
|
deleteComment_title: 'Delete Comment',
|
||||||
|
deleteLabel_title: 'Delete Label',
|
||||||
|
deleteList_title: 'Delete List',
|
||||||
|
deleteProject_title: 'Delete Project',
|
||||||
|
deleteTask_title: 'Delete Task',
|
||||||
|
deleteUser_title: 'Delete User',
|
||||||
|
description: 'Description',
|
||||||
|
detectAutomatically: 'Detect automatically',
|
||||||
|
dropFileToUpload: 'Drop file to upload',
|
||||||
|
editor: 'Editor',
|
||||||
|
editAttachment_title: 'Edit Attachment',
|
||||||
|
editAvatar_title: 'Edit Avatar',
|
||||||
|
editBoard_title: 'Edit Board',
|
||||||
|
editDueDate_title: 'Edit Due Date',
|
||||||
|
editEmail_title: 'Edit E-mail',
|
||||||
|
editInformation_title: 'Edit Information',
|
||||||
|
editLabel_title: 'Edit Label',
|
||||||
|
editPassword_title: 'Edit Password',
|
||||||
|
editPermissions_title: 'Edit Permissions',
|
||||||
|
editStopwatch_title: 'Edit Stopwatch',
|
||||||
|
editUsername_title: 'Edit Username',
|
||||||
|
email: 'E-mail',
|
||||||
|
emailAlreadyInUse: 'E-mail already in use',
|
||||||
|
enterCardTitle: 'Enter card title... [Ctrl+Enter] to auto-open.',
|
||||||
|
enterDescription: 'Enter description...',
|
||||||
|
enterFilename: 'Enter filename',
|
||||||
|
enterListTitle: 'Enter list title...',
|
||||||
|
enterProjectTitle: 'Enter project title',
|
||||||
|
enterTaskDescription: 'Enter task description...',
|
||||||
|
filterByLabels_title: 'Filter By Labels',
|
||||||
|
filterByMembers_title: 'Filter By Members',
|
||||||
|
fromComputer_title: 'From Computer',
|
||||||
|
fromTrello: 'From Trello',
|
||||||
|
general: 'General',
|
||||||
|
hours: 'Hours',
|
||||||
|
importBoard_title: 'Import Board',
|
||||||
|
invalidCurrentPassword: 'Invalid current password',
|
||||||
|
labels: 'Labels',
|
||||||
|
language: 'Language',
|
||||||
|
leaveBoard_title: 'Leave Board',
|
||||||
|
leaveProject_title: 'Leave Project',
|
||||||
|
linkIsCopied: 'Link is copied',
|
||||||
|
list: 'List',
|
||||||
|
listActions_title: 'List Actions',
|
||||||
|
managers: 'Managers',
|
||||||
|
managerActions_title: 'Manager Actions',
|
||||||
|
members: 'Members',
|
||||||
|
memberActions_title: 'Member Actions',
|
||||||
|
minutes: 'Minutes',
|
||||||
|
moveCard_title: 'Move Card',
|
||||||
|
name: 'Name',
|
||||||
|
newestFirst: 'Newest first',
|
||||||
|
newEmail: 'New e-mail',
|
||||||
|
newPassword: 'New password',
|
||||||
|
newUsername: 'New username',
|
||||||
|
noConnectionToServer: 'No connection to server',
|
||||||
|
noBoards: 'No boards',
|
||||||
|
noLists: 'No lists',
|
||||||
|
noProjects: 'No projects',
|
||||||
|
notifications: 'Notifications',
|
||||||
|
noUnreadNotifications: 'No unread notifications.',
|
||||||
|
oldestFirst: 'Oldest first',
|
||||||
|
openBoard_title: 'Open Board',
|
||||||
|
optional_inline: 'optional',
|
||||||
|
organization: 'Organization',
|
||||||
|
phone: 'Phone',
|
||||||
|
preferences: 'Preferences',
|
||||||
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
|
'Tip: press Ctrl-V (Cmd-V on Mac) to add an attachment from the clipboard.',
|
||||||
|
project: 'Project',
|
||||||
|
projectNotFound_title: 'Project Not Found',
|
||||||
|
removeManager_title: 'Remove Manager',
|
||||||
|
removeMember_title: 'Remove Member',
|
||||||
|
searchLabels: 'Search labels...',
|
||||||
|
searchMembers: 'Search members...',
|
||||||
|
searchUsers: 'Search users...',
|
||||||
|
searchCards: 'Search cards...',
|
||||||
|
seconds: 'Seconds',
|
||||||
|
selectBoard: 'Select board',
|
||||||
|
selectList: 'Select list',
|
||||||
|
selectPermissions_title: 'Select Permissions',
|
||||||
|
selectProject: 'Select project',
|
||||||
|
settings: 'Settings',
|
||||||
|
sortList_title: 'Sort List',
|
||||||
|
stopwatch: 'Stopwatch',
|
||||||
|
subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
|
||||||
|
taskActions_title: 'Task Actions',
|
||||||
|
tasks: 'Tasks',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment:
|
||||||
|
'There is no preview available for this attachment.',
|
||||||
|
time: 'Time',
|
||||||
|
title: 'Title',
|
||||||
|
userActions_title: 'User Actions',
|
||||||
|
userAddedThisCardToList: '<0>{{user}}</0><1> added this card to {{list}}</1>',
|
||||||
|
userLeftNewCommentToCard: '{{user}} left a new comment «{{comment}}» to <2>{{card}}</2>',
|
||||||
|
userMovedCardFromListToList: '{{user}} moved <2>{{card}}</2> from {{fromList}} to {{toList}}',
|
||||||
|
userMovedThisCardFromListToList:
|
||||||
|
'<0>{{user}}</0><1> moved this card from {{fromList}} to {{toList}}</1>',
|
||||||
|
username: 'Username',
|
||||||
|
usernameAlreadyInUse: 'Username already in use',
|
||||||
|
users: 'Users',
|
||||||
|
version: 'Version',
|
||||||
|
viewer: 'Viewer',
|
||||||
|
writeComment: 'Write a comment...',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
addAnotherCard: 'Add another card',
|
||||||
|
addAnotherList: 'Add another list',
|
||||||
|
addAnotherTask: 'Add another task',
|
||||||
|
addCard: 'Add card',
|
||||||
|
addCard_title: 'Add Card',
|
||||||
|
addComment: 'Add comment',
|
||||||
|
addList: 'Add list',
|
||||||
|
addMember: 'Add member',
|
||||||
|
addMoreDetailedDescription: 'Add more detailed description',
|
||||||
|
addTask: 'Add task',
|
||||||
|
addToCard: 'Add to card',
|
||||||
|
addUser: 'Add user',
|
||||||
|
copyLink_title: 'Copy Link',
|
||||||
|
createBoard: 'Create board',
|
||||||
|
createFile: 'Create file',
|
||||||
|
createLabel: 'Create label',
|
||||||
|
createNewLabel: 'Create new label',
|
||||||
|
createProject: 'Create project',
|
||||||
|
delete: 'Delete',
|
||||||
|
deleteAttachment: 'Delete attachment',
|
||||||
|
deleteAvatar: 'Delete avatar',
|
||||||
|
deleteBoard: 'Delete board',
|
||||||
|
deleteCard: 'Delete card',
|
||||||
|
deleteCard_title: 'Delete Card',
|
||||||
|
deleteComment: 'Delete comment',
|
||||||
|
deleteImage: 'Delete image',
|
||||||
|
deleteLabel: 'Delete label',
|
||||||
|
deleteList: 'Delete list',
|
||||||
|
deleteList_title: 'Delete List',
|
||||||
|
deleteProject: 'Delete project',
|
||||||
|
deleteProject_title: 'Delete Project',
|
||||||
|
deleteTask: 'Delete task',
|
||||||
|
deleteTask_title: 'Delete Task',
|
||||||
|
deleteUser: 'Delete user',
|
||||||
|
duplicate: 'Duplicate',
|
||||||
|
duplicateCard_title: 'Duplicate Card',
|
||||||
|
edit: 'Edit',
|
||||||
|
editDueDate_title: 'Edit Due Date',
|
||||||
|
editDescription_title: 'Edit Description',
|
||||||
|
editEmail_title: 'Edit E-mail',
|
||||||
|
editInformation_title: 'Edit Information',
|
||||||
|
editPassword_title: 'Edit Password',
|
||||||
|
editPermissions: 'Edit permissions',
|
||||||
|
editStopwatch_title: 'Edit Stopwatch',
|
||||||
|
editTitle_title: 'Edit Title',
|
||||||
|
editUsername_title: 'Edit Username',
|
||||||
|
hideDetails: 'Hide details',
|
||||||
|
import: 'Import',
|
||||||
|
leaveBoard: 'Leave board',
|
||||||
|
leaveProject: 'Leave project',
|
||||||
|
logOut_title: 'Log Out',
|
||||||
|
makeCover_title: 'Make Cover',
|
||||||
|
move: 'Move',
|
||||||
|
moveCard_title: 'Move Card',
|
||||||
|
remove: 'Remove',
|
||||||
|
removeBackground: 'Remove background',
|
||||||
|
removeCover_title: 'Remove Cover',
|
||||||
|
removeFromBoard: 'Remove from board',
|
||||||
|
removeFromProject: 'Remove from project',
|
||||||
|
removeManager: 'Remove manager',
|
||||||
|
removeMember: 'Remove member',
|
||||||
|
save: 'Save',
|
||||||
|
showAllAttachments: 'Show all attachments ({{hidden}} hidden)',
|
||||||
|
showDetails: 'Show details',
|
||||||
|
showFewerAttachments: 'Show fewer attachments',
|
||||||
|
sortList_title: 'Sort List',
|
||||||
|
start: 'Start',
|
||||||
|
stop: 'Stop',
|
||||||
|
subscribe: 'Subscribe',
|
||||||
|
unsubscribe: 'Unsubscribe',
|
||||||
|
uploadNewAvatar: 'Upload new avatar',
|
||||||
|
uploadNewImage: 'Upload new image',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
8
client/src/locales/en-GB/index.js
Normal file
8
client/src/locales/en-GB/index.js
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import login from './login';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
language: 'en-GB',
|
||||||
|
country: 'gb',
|
||||||
|
name: 'English',
|
||||||
|
embeddedLocale: login,
|
||||||
|
};
|
||||||
23
client/src/locales/en-GB/login.js
Normal file
23
client/src/locales/en-GB/login.js
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
export default {
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
emailOrUsername: 'E-mail or username',
|
||||||
|
invalidEmailOrUsername: 'Invalid e-mail or username',
|
||||||
|
invalidCredentials: 'Invalid credentials',
|
||||||
|
invalidPassword: 'Invalid password',
|
||||||
|
logInToPlanka: 'Log in to Planka',
|
||||||
|
noInternetConnection: 'No internet connection',
|
||||||
|
pageNotFound_title: 'Page Not Found',
|
||||||
|
password: 'Password',
|
||||||
|
projectManagement: 'Project management',
|
||||||
|
serverConnectionFailed: 'Server connection failed',
|
||||||
|
unknownError: 'Unknown error, try again later',
|
||||||
|
useSingleSignOn: 'Use single sign-on',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
logIn: 'Log in',
|
||||||
|
logInWithSSO: 'Log in with SSO',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -3,6 +3,7 @@ import bgBG from './bg-BG';
|
|||||||
import csCZ from './cs-CZ';
|
import csCZ from './cs-CZ';
|
||||||
import daDK from './da-DK';
|
import daDK from './da-DK';
|
||||||
import deDE from './de-DE';
|
import deDE from './de-DE';
|
||||||
|
import enGB from './en-GB';
|
||||||
import enUS from './en-US';
|
import enUS from './en-US';
|
||||||
import esES from './es-ES';
|
import esES from './es-ES';
|
||||||
import faIR from './fa-IR';
|
import faIR from './fa-IR';
|
||||||
@@ -31,6 +32,7 @@ const locales = [
|
|||||||
csCZ,
|
csCZ,
|
||||||
daDK,
|
daDK,
|
||||||
deDE,
|
deDE,
|
||||||
|
enGB,
|
||||||
enUS,
|
enUS,
|
||||||
esES,
|
esES,
|
||||||
faIR,
|
faIR,
|
||||||
|
|||||||
@@ -115,6 +115,23 @@ export const makeSelectTasksByCardId = () =>
|
|||||||
|
|
||||||
export const selectTasksByCardId = makeSelectTasksByCardId();
|
export const selectTasksByCardId = makeSelectTasksByCardId();
|
||||||
|
|
||||||
|
export const makeSelectAttachmentsTotalByCardId = () =>
|
||||||
|
createSelector(
|
||||||
|
orm,
|
||||||
|
(_, id) => id,
|
||||||
|
({ Card }, id) => {
|
||||||
|
const cardModel = Card.withId(id);
|
||||||
|
|
||||||
|
if (!cardModel) {
|
||||||
|
return cardModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
return cardModel.attachments.count();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
export const selectAttachmentsTotalByCardId = makeSelectAttachmentsTotalByCardId();
|
||||||
|
|
||||||
export const makeSelectLastActivityIdByCardId = () =>
|
export const makeSelectLastActivityIdByCardId = () =>
|
||||||
createSelector(
|
createSelector(
|
||||||
orm,
|
orm,
|
||||||
@@ -334,6 +351,8 @@ export default {
|
|||||||
selectTaskIdsByCardId,
|
selectTaskIdsByCardId,
|
||||||
makeSelectTasksByCardId,
|
makeSelectTasksByCardId,
|
||||||
selectTasksByCardId,
|
selectTasksByCardId,
|
||||||
|
makeSelectAttachmentsTotalByCardId,
|
||||||
|
selectAttachmentsTotalByCardId,
|
||||||
makeSelectLastActivityIdByCardId,
|
makeSelectLastActivityIdByCardId,
|
||||||
selectLastActivityIdByCardId,
|
selectLastActivityIdByCardId,
|
||||||
makeSelectNotificationsByCardId,
|
makeSelectNotificationsByCardId,
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
// eslint-disable-next-line import/prefer-default-export
|
|
||||||
export const focusEnd = (element) => {
|
export const focusEnd = (element) => {
|
||||||
element.focus();
|
element.focus();
|
||||||
element.setSelectionRange(element.value.length + 1, element.value.length + 1);
|
element.setSelectionRange(element.value.length + 1, element.value.length + 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const isActiveTextElement = (element) =>
|
||||||
|
['input', 'textarea'].includes(element.tagName.toLowerCase()) &&
|
||||||
|
element === document.activeElement;
|
||||||
|
|||||||
102
client/src/utils/parse-time.js
Normal file
102
client/src/utils/parse-time.js
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
import parseDate from 'date-fns/parse';
|
||||||
|
|
||||||
|
const TIME_REGEX =
|
||||||
|
/^((\d{1,2})((:|\.)?(\d{1,2}))?)(a|p|(am|a\.m\.|midnight|mi|pm|p\.m\.|noon|n))?$/;
|
||||||
|
|
||||||
|
const ALTERNATIVE_AM_MERIDIEMS_SET = new Set(['am', 'a.m.', 'midnight', 'mi']);
|
||||||
|
const ALTERNATIVE_PM_MERIDIEMS_SET = new Set(['pm', 'p.m.', 'noon', 'n']);
|
||||||
|
|
||||||
|
const TimeFormats = {
|
||||||
|
TWENTY_FOUR_HOUR: 'twentyFourHour',
|
||||||
|
TWELVE_HOUR: 'twelveHour',
|
||||||
|
};
|
||||||
|
|
||||||
|
const PATTERNS_GROUPS_BY_TIME_FORMAT = {
|
||||||
|
[TimeFormats.TWENTY_FOUR_HOUR]: {
|
||||||
|
byNumbersTotal: {
|
||||||
|
1: ['H'],
|
||||||
|
2: ['HH'],
|
||||||
|
3: ['Hmm'],
|
||||||
|
4: ['HHmm'],
|
||||||
|
},
|
||||||
|
withDelimiter: ['H:m', 'H:mm', 'HH:m', 'HH:mm'],
|
||||||
|
},
|
||||||
|
[TimeFormats.TWELVE_HOUR]: {
|
||||||
|
byNumbersTotal: {
|
||||||
|
1: ['haaaaa'],
|
||||||
|
2: ['hhaaaaa'],
|
||||||
|
3: ['hmmaaaaa'],
|
||||||
|
4: ['hhmmaaaaa'],
|
||||||
|
},
|
||||||
|
withDelimiter: ['h:maaaaa', 'h:mmaaaaa', 'hh:maaaaa', 'hh:mmaaaaa'],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const INVALID_DATE = new Date('invalid-date');
|
||||||
|
|
||||||
|
const normalizeDelimeter = (delimeter) => (delimeter === '.' ? ':' : delimeter);
|
||||||
|
|
||||||
|
const normalizeMeridiem = (meridiem, alternativeMeridiem) => {
|
||||||
|
if (meridiem && alternativeMeridiem) {
|
||||||
|
if (ALTERNATIVE_AM_MERIDIEMS_SET.has(alternativeMeridiem)) {
|
||||||
|
return 'a';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ALTERNATIVE_PM_MERIDIEMS_SET.has(alternativeMeridiem)) {
|
||||||
|
return 'p';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return meridiem;
|
||||||
|
};
|
||||||
|
|
||||||
|
const makeTimeString = (hours, minutes, delimeter, meridiem) => {
|
||||||
|
let timeString = hours;
|
||||||
|
if (delimeter) {
|
||||||
|
timeString += delimeter;
|
||||||
|
}
|
||||||
|
if (minutes) {
|
||||||
|
timeString += minutes;
|
||||||
|
}
|
||||||
|
if (meridiem) {
|
||||||
|
timeString += meridiem;
|
||||||
|
}
|
||||||
|
|
||||||
|
return timeString;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default (string, referenceDate) => {
|
||||||
|
const match = string.replace(/\s/g, '').toLowerCase().match(TIME_REGEX);
|
||||||
|
|
||||||
|
if (!match) {
|
||||||
|
return INVALID_DATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
const [, hoursAndMinutes, hours, , delimeter, minutes, meridiem, alternativeMeridiem] = match;
|
||||||
|
|
||||||
|
const normalizedDelimeter = normalizeDelimeter(delimeter);
|
||||||
|
const normalizedMeridiem = normalizeMeridiem(meridiem, alternativeMeridiem);
|
||||||
|
|
||||||
|
const timeString = makeTimeString(hours, minutes, normalizedDelimeter, normalizedMeridiem);
|
||||||
|
|
||||||
|
const timeFormat = meridiem ? TimeFormats.TWELVE_HOUR : TimeFormats.TWENTY_FOUR_HOUR;
|
||||||
|
const patternsGroups = PATTERNS_GROUPS_BY_TIME_FORMAT[timeFormat];
|
||||||
|
|
||||||
|
const patterns = delimeter
|
||||||
|
? patternsGroups.withDelimiter
|
||||||
|
: patternsGroups.byNumbersTotal[hoursAndMinutes.length];
|
||||||
|
|
||||||
|
if (!referenceDate) {
|
||||||
|
referenceDate = new Date(); // eslint-disable-line no-param-reassign
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let i = 0; i < patterns.length; i += 1) {
|
||||||
|
const parsedDate = parseDate(timeString, patterns[i], referenceDate);
|
||||||
|
|
||||||
|
if (!Number.isNaN(parsedDate.getTime())) {
|
||||||
|
return parsedDate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return INVALID_DATE;
|
||||||
|
};
|
||||||
@@ -1 +1 @@
|
|||||||
export default '1.23.0';
|
export default '1.23.3';
|
||||||
|
|||||||
12
client/tests/acceptance/config.js
Normal file
12
client/tests/acceptance/config.js
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
module.exports = {
|
||||||
|
// environment
|
||||||
|
adminUser: {
|
||||||
|
email: 'demo@demo.demo',
|
||||||
|
password: 'demo',
|
||||||
|
},
|
||||||
|
baseUrl: process.env.BASE_URL ?? 'http://localhost:1337/',
|
||||||
|
// playwright
|
||||||
|
slowMo: parseInt(process.env.SLOW_MO, 10) || 1000,
|
||||||
|
timeout: parseInt(process.env.TIMEOUT, 10) || 6000,
|
||||||
|
headless: process.env.HEADLESS !== 'true',
|
||||||
|
};
|
||||||
35
client/tests/acceptance/cucumber.conf.js
Normal file
35
client/tests/acceptance/cucumber.conf.js
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
// cucumber.conf.js file
|
||||||
|
|
||||||
|
const { Before, BeforeAll, AfterAll, After, setDefaultTimeout } = require('@cucumber/cucumber');
|
||||||
|
const { chromium } = require('playwright');
|
||||||
|
const { deleteProject } = require('./testHelpers/apiHelpers');
|
||||||
|
const config = require('./config');
|
||||||
|
|
||||||
|
setDefaultTimeout(config.timeout);
|
||||||
|
|
||||||
|
// launch the browser
|
||||||
|
BeforeAll(async function () {
|
||||||
|
global.browser = await chromium.launch({
|
||||||
|
// makes true for CI
|
||||||
|
headless: config.headless,
|
||||||
|
slowMo: config.slowMo,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// close the browser
|
||||||
|
AfterAll(async function () {
|
||||||
|
await global.browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Create a new browser context and page per scenario
|
||||||
|
Before(async function () {
|
||||||
|
global.context = await global.browser.newContext();
|
||||||
|
global.page = await global.context.newPage();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Cleanup after each scenario
|
||||||
|
After(async function () {
|
||||||
|
await deleteProject();
|
||||||
|
await global.page.close();
|
||||||
|
await global.context.close();
|
||||||
|
});
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
Feature: dashboard
|
||||||
|
As a admin
|
||||||
|
I want to create a project
|
||||||
|
So that I can manage project
|
||||||
|
|
||||||
|
Scenario: create a new project
|
||||||
|
Given user has browsed to the login page
|
||||||
|
And user has logged in with email "demo@demo.demo" and password "demo"
|
||||||
|
When the user creates a project with name "testproject" using the webUI
|
||||||
|
Then the created project "testproject" should be opened
|
||||||
27
client/tests/acceptance/features/webUILogin/login.feature
Normal file
27
client/tests/acceptance/features/webUILogin/login.feature
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
Feature: login
|
||||||
|
As a admin
|
||||||
|
I want to log in
|
||||||
|
So that I can manage project
|
||||||
|
|
||||||
|
|
||||||
|
Scenario: User logs in with valid credentials
|
||||||
|
Given user has browsed to the login page
|
||||||
|
When user logs in with username "demo@demo.demo" and password "demo" using the webUI
|
||||||
|
Then the user should be in dashboard page
|
||||||
|
|
||||||
|
|
||||||
|
Scenario Outline: login with invalid username and invalid password
|
||||||
|
Given user has browsed to the login page
|
||||||
|
When user logs in with username "<username>" and password "<password>" using the webUI
|
||||||
|
Then user should see the error message "<message>"
|
||||||
|
Examples:
|
||||||
|
| username | password | message |
|
||||||
|
| spiderman | spidy123 | Invalid credentials |
|
||||||
|
| ironman | iron123 | Invalid credentials |
|
||||||
|
| aquaman | aqua123 | Invalid credentials |
|
||||||
|
|
||||||
|
|
||||||
|
Scenario: User can log out
|
||||||
|
Given user has logged in with email "demo@demo.demo" and password "demo"
|
||||||
|
When user logs out using the webUI
|
||||||
|
Then the user should be in the login page
|
||||||
16
client/tests/acceptance/pageObjects/DashboardPage.js
Normal file
16
client/tests/acceptance/pageObjects/DashboardPage.js
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
class DashboardPage {
|
||||||
|
constructor() {
|
||||||
|
this.createProjectIconSelector = `.Projects_addTitle__tXhB4`;
|
||||||
|
this.projectTitleInputSelector = `input[name="name"]`;
|
||||||
|
this.createProjectButtonSelector = `//button[text()="Create project"]`;
|
||||||
|
this.projectTitleSelector = `//div[@class="item Header_item__OOEY7 Header_title__l+wMf"][text()="%s"]`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async createProject(project) {
|
||||||
|
await page.click(this.createProjectIconSelector);
|
||||||
|
await page.fill(this.projectTitleInputSelector, project);
|
||||||
|
await page.click(this.createProjectButtonSelector);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = DashboardPage;
|
||||||
38
client/tests/acceptance/pageObjects/LoginPage.js
Normal file
38
client/tests/acceptance/pageObjects/LoginPage.js
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
const config = require(`../config`);
|
||||||
|
|
||||||
|
class LoginPage {
|
||||||
|
constructor() {
|
||||||
|
// url
|
||||||
|
this.homeUrl = config.baseUrl;
|
||||||
|
this.loginUrl = `${this.homeUrl}login`;
|
||||||
|
|
||||||
|
// selectors
|
||||||
|
this.loginButtonSelector = `//i[@class="right arrow icon"]`;
|
||||||
|
this.usernameSelector = `//input[@name='emailOrUsername']`;
|
||||||
|
this.passwordSelector = `//input[@name='password']`;
|
||||||
|
this.errorMessageSelector = `//div[@class='ui error visible message']`;
|
||||||
|
this.userActionSelector = `//span[@class="User_initials__9Wp90"]`;
|
||||||
|
this.logOutSelector = `//a[@class="item UserStep_menuItem__5pvtT"][contains(text(),'Log Out')]`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async goToLoginUrl() {
|
||||||
|
await page.goto(this.loginUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
async logOut() {
|
||||||
|
await page.click(this.userActionSelector);
|
||||||
|
await page.click(this.logOutSelector);
|
||||||
|
}
|
||||||
|
|
||||||
|
async login(username, password) {
|
||||||
|
await page.fill(this.usernameSelector, username);
|
||||||
|
await page.fill(this.passwordSelector, password);
|
||||||
|
await page.click(this.loginButtonSelector);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getErrorMessage() {
|
||||||
|
return page.innerText(this.errorMessageSelector);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = LoginPage;
|
||||||
17
client/tests/acceptance/stepDefinitions/dashBoardContext.js
Normal file
17
client/tests/acceptance/stepDefinitions/dashBoardContext.js
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
const { When, Then } = require('@cucumber/cucumber');
|
||||||
|
const util = require('util');
|
||||||
|
const { expect } = require('playwright/test');
|
||||||
|
|
||||||
|
const DashboardPage = require('../pageObjects/DashboardPage');
|
||||||
|
|
||||||
|
const dashboardPage = new DashboardPage();
|
||||||
|
|
||||||
|
When('the user creates a project with name {string} using the webUI', async function (project) {
|
||||||
|
await dashboardPage.createProject(project);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('the created project {string} should be opened', async function (project) {
|
||||||
|
expect(
|
||||||
|
await page.locator(util.format(dashboardPage.projectTitleSelector, project)),
|
||||||
|
).toBeVisible();
|
||||||
|
});
|
||||||
53
client/tests/acceptance/stepDefinitions/loginContext.js
Normal file
53
client/tests/acceptance/stepDefinitions/loginContext.js
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
const { Given, When, Then } = require('@cucumber/cucumber');
|
||||||
|
|
||||||
|
// import expect for assertion
|
||||||
|
const { expect } = require('@playwright/test');
|
||||||
|
|
||||||
|
// import assert
|
||||||
|
const assert = require('assert');
|
||||||
|
|
||||||
|
const LoginPage = require('../pageObjects/LoginPage');
|
||||||
|
|
||||||
|
const loginPage = new LoginPage();
|
||||||
|
|
||||||
|
Given('user has browsed to the login page', async function () {
|
||||||
|
await loginPage.goToLoginUrl();
|
||||||
|
await expect(page).toHaveURL(loginPage.loginUrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
Given(
|
||||||
|
'user has logged in with email {string} and password {string}',
|
||||||
|
async function (username, password) {
|
||||||
|
await loginPage.goToLoginUrl();
|
||||||
|
await loginPage.login(username, password);
|
||||||
|
await expect(page).toHaveURL(loginPage.homeUrl);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
When(
|
||||||
|
'user logs in with username {string} and password {string} using the webUI',
|
||||||
|
async function (username, password) {
|
||||||
|
await loginPage.login(username, password);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
Then('the user should be in dashboard page', async function () {
|
||||||
|
await expect(page).toHaveURL(loginPage.homeUrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('user should see the error message {string}', async function (errorMessage) {
|
||||||
|
const actualErrorMessage = await loginPage.getErrorMessage();
|
||||||
|
assert.equal(
|
||||||
|
actualErrorMessage,
|
||||||
|
errorMessage,
|
||||||
|
`Expected message to be "${errorMessage}" but receive "${actualErrorMessage}"`,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
When('user logs out using the webUI', async function () {
|
||||||
|
await loginPage.logOut();
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('the user should be in the login page', async function () {
|
||||||
|
await expect(page).toHaveURL(loginPage.loginUrl);
|
||||||
|
});
|
||||||
57
client/tests/acceptance/testHelpers/apiHelpers.js
Normal file
57
client/tests/acceptance/testHelpers/apiHelpers.js
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
const axios = require('axios');
|
||||||
|
const config = require('../config');
|
||||||
|
|
||||||
|
async function getXauthToken() {
|
||||||
|
try {
|
||||||
|
const res = await axios.post(
|
||||||
|
`${config.baseUrl}api/access-tokens`,
|
||||||
|
{
|
||||||
|
emailOrUsername: config.adminUser.email,
|
||||||
|
password: config.adminUser.password,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return res.data.item;
|
||||||
|
} catch (error) {
|
||||||
|
return `Error requesting access token: ${error.message}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getProjectIDs() {
|
||||||
|
try {
|
||||||
|
const res = await axios.get(`${config.baseUrl}api/projects`, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${await getXauthToken()}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return res.data.items.map((project) => project.id);
|
||||||
|
} catch (error) {
|
||||||
|
return `Error requesting projectIDs: ${error.message}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deleteProject() {
|
||||||
|
try {
|
||||||
|
const projectIDs = await getProjectIDs();
|
||||||
|
await Promise.all(
|
||||||
|
projectIDs.map(async (project) => {
|
||||||
|
await axios.delete(`${config.baseUrl}api/projects/${project}`, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${await getXauthToken()}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
return `Error deleting project: ${error.message}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
deleteProject,
|
||||||
|
};
|
||||||
23
client/tests/setup-symlinks.sh
Executable file
23
client/tests/setup-symlinks.sh
Executable file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# This script sets up symbolic links between the client build files and the server directories,
|
||||||
|
|
||||||
|
# Navigate to the root directory of the git repository
|
||||||
|
cd "$(git rev-parse --show-toplevel)" || { echo "Failed to navigate to the git repository root"; exit 1; }
|
||||||
|
|
||||||
|
# Store paths for the client build, server public directory, and server views directory
|
||||||
|
CLIENT_PATH=$(pwd)/client/build
|
||||||
|
SERVER_PUBLIC_PATH=$(pwd)/server/public
|
||||||
|
SERVER_VIEWS_PATH=$(pwd)/server/views
|
||||||
|
|
||||||
|
# Create symbolic links for the necessary client assets in the server's public and views directories
|
||||||
|
ln -s ${CLIENT_PATH}/asset-manifest.json ${SERVER_PUBLIC_PATH}/asset-manifest.json && echo "Linked asset-manifest.json successfully"
|
||||||
|
ln -s ${CLIENT_PATH}/favicon.ico ${SERVER_PUBLIC_PATH}/favicon.ico && echo "Linked favicon.ico successfully"
|
||||||
|
ln -s ${CLIENT_PATH}/logo192.png ${SERVER_PUBLIC_PATH}/logo192.png && echo "Linked logo192.png successfully"
|
||||||
|
ln -s ${CLIENT_PATH}/logo512.png ${SERVER_PUBLIC_PATH}/logo512.png && echo "Linked logo512.png successfully"
|
||||||
|
ln -s ${CLIENT_PATH}/manifest.json ${SERVER_PUBLIC_PATH}/manifest.json && echo "Linked manifest.json successfully"
|
||||||
|
ln -s ${CLIENT_PATH}/robots.txt ${SERVER_PUBLIC_PATH}/robots.txt && echo "Linked robots.txt successfully"
|
||||||
|
ln -s ${CLIENT_PATH}/static ${SERVER_PUBLIC_PATH}/static && echo "Linked static folder successfully"
|
||||||
|
ln -s ${CLIENT_PATH}/index.html ${SERVER_VIEWS_PATH}/index.ejs && echo "Linked index.html to index.ejs successfully"
|
||||||
|
|
||||||
|
echo "Setup symbolic links completed successfully."
|
||||||
@@ -2,7 +2,7 @@ version: '3'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:alpine
|
image: postgres:16-alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/var/lib/postgresql/data
|
- db-data:/var/lib/postgresql/data
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ services:
|
|||||||
# - SMTP_USER=
|
# - SMTP_USER=
|
||||||
# - SMTP_PASSWORD=
|
# - SMTP_PASSWORD=
|
||||||
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
||||||
|
# - SMTP_TLS_REJECT_UNAUTHORIZED=false
|
||||||
|
|
||||||
# Optional fields: accessToken, events, excludedEvents
|
# Optional fields: accessToken, events, excludedEvents
|
||||||
# - |
|
# - |
|
||||||
@@ -109,7 +110,7 @@ services:
|
|||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:latest
|
image: postgres:16-alpine
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/var/lib/postgresql/data
|
- db-data:/var/lib/postgresql/data
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ services:
|
|||||||
# - SMTP_USER=
|
# - SMTP_USER=
|
||||||
# - SMTP_PASSWORD=
|
# - SMTP_PASSWORD=
|
||||||
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
||||||
|
# - SMTP_TLS_REJECT_UNAUTHORIZED=false
|
||||||
|
|
||||||
# Optional fields: accessToken, events, excludedEvents
|
# Optional fields: accessToken, events, excludedEvents
|
||||||
# - |
|
# - |
|
||||||
@@ -79,7 +80,7 @@ services:
|
|||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:14-alpine
|
image: postgres:16-alpine
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/var/lib/postgresql/data
|
- db-data:/var/lib/postgresql/data
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.23.0",
|
"version": "1.23.3",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.23.0",
|
"version": "1.23.3",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.23.0",
|
"version": "1.23.3",
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": "https://plankanban.github.io/planka",
|
"homepage": "https://plankanban.github.io/planka",
|
||||||
"repository": {
|
"repository": {
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
"test": "npm run server:test && npm run client:test"
|
"test": "npm run server:test && npm run client:test"
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
"client/**/*.{js,jsx}": [
|
"client/src/**/*.{js,jsx}": [
|
||||||
"npm run client:lint"
|
"npm run client:lint"
|
||||||
],
|
],
|
||||||
"server/**/*.js": [
|
"server/**/*.js": [
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ SECRET_KEY=notsecretkey
|
|||||||
# SMTP_USER=
|
# SMTP_USER=
|
||||||
# SMTP_PASSWORD=
|
# SMTP_PASSWORD=
|
||||||
# SMTP_FROM="Demo Demo" <demo@demo.demo>
|
# SMTP_FROM="Demo Demo" <demo@demo.demo>
|
||||||
|
# SMTP_TLS_REJECT_UNAUTHORIZED=false
|
||||||
|
|
||||||
# Optional fields: accessToken, events, excludedEvents
|
# Optional fields: accessToken, events, excludedEvents
|
||||||
# WEBHOOKS='[{
|
# WEBHOOKS='[{
|
||||||
|
|||||||
@@ -33,6 +33,9 @@ module.exports = function defineSmtpHook(sails) {
|
|||||||
user: sails.config.custom.smtpUser,
|
user: sails.config.custom.smtpUser,
|
||||||
pass: sails.config.custom.smtpPassword,
|
pass: sails.config.custom.smtpPassword,
|
||||||
},
|
},
|
||||||
|
tls: {
|
||||||
|
rejectUnauthorized: sails.config.custom.smtpTlsRejectUnauthorized,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ const LANGUAGES = [
|
|||||||
'cs-CZ',
|
'cs-CZ',
|
||||||
'da-DK',
|
'da-DK',
|
||||||
'de-DE',
|
'de-DE',
|
||||||
|
'en-GB',
|
||||||
'en-US',
|
'en-US',
|
||||||
'es-ES',
|
'es-ES',
|
||||||
'fa-IR',
|
'fa-IR',
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ module.exports.custom = {
|
|||||||
smtpUser: process.env.SMTP_USER,
|
smtpUser: process.env.SMTP_USER,
|
||||||
smtpPassword: process.env.SMTP_PASSWORD,
|
smtpPassword: process.env.SMTP_PASSWORD,
|
||||||
smtpFrom: process.env.SMTP_FROM,
|
smtpFrom: process.env.SMTP_FROM,
|
||||||
|
smtpTlsRejectUnauthorized: process.env.SMTP_TLS_REJECT_UNAUTHORIZED !== 'false',
|
||||||
|
|
||||||
webhooks: JSON.parse(process.env.WEBHOOKS || '[]'), // TODO: validate structure
|
webhooks: JSON.parse(process.env.WEBHOOKS || '[]'), // TODO: validate structure
|
||||||
|
|
||||||
|
|||||||
31
server/package-lock.json
generated
31
server/package-lock.json
generated
@@ -5,7 +5,6 @@
|
|||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "planka-server",
|
"name": "planka-server",
|
||||||
"hasInstallScript": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bcrypt": "^5.1.1",
|
"bcrypt": "^5.1.1",
|
||||||
"dotenv": "^16.4.5",
|
"dotenv": "^16.4.5",
|
||||||
@@ -18,7 +17,7 @@
|
|||||||
"nodemailer": "^6.9.15",
|
"nodemailer": "^6.9.15",
|
||||||
"openid-client": "^5.7.0",
|
"openid-client": "^5.7.0",
|
||||||
"rimraf": "^5.0.10",
|
"rimraf": "^5.0.10",
|
||||||
"sails": "^1.5.11",
|
"sails": "^1.5.12",
|
||||||
"sails-hook-orm": "^4.0.3",
|
"sails-hook-orm": "^4.0.3",
|
||||||
"sails-hook-sockets": "^3.0.1",
|
"sails-hook-sockets": "^3.0.1",
|
||||||
"sails-postgresql": "^5.0.1",
|
"sails-postgresql": "^5.0.1",
|
||||||
@@ -755,11 +754,6 @@
|
|||||||
"ms": "2.0.0"
|
"ms": "2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@sailshq/router/node_modules/ms": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
|
|
||||||
},
|
|
||||||
"node_modules/@sailshq/router/node_modules/parseurl": {
|
"node_modules/@sailshq/router/node_modules/parseurl": {
|
||||||
"version": "1.3.3",
|
"version": "1.3.3",
|
||||||
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
|
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
|
||||||
@@ -1651,11 +1645,6 @@
|
|||||||
"ms": "2.0.0"
|
"ms": "2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/compression/node_modules/ms": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
|
|
||||||
},
|
|
||||||
"node_modules/compression/node_modules/safe-buffer": {
|
"node_modules/compression/node_modules/safe-buffer": {
|
||||||
"version": "5.1.1",
|
"version": "5.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
|
||||||
@@ -2686,11 +2675,6 @@
|
|||||||
"ms": "2.0.0"
|
"ms": "2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/express-session/node_modules/ms": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
|
|
||||||
},
|
|
||||||
"node_modules/express-session/node_modules/parseurl": {
|
"node_modules/express-session/node_modules/parseurl": {
|
||||||
"version": "1.3.3",
|
"version": "1.3.3",
|
||||||
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
|
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
|
||||||
@@ -2765,11 +2749,6 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/express/node_modules/ms": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
|
|
||||||
},
|
|
||||||
"node_modules/express/node_modules/parseurl": {
|
"node_modules/express/node_modules/parseurl": {
|
||||||
"version": "1.3.3",
|
"version": "1.3.3",
|
||||||
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
|
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
|
||||||
@@ -6490,14 +6469,6 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/send/node_modules/toidentifier": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/serialize-javascript": {
|
"node_modules/serialize-javascript": {
|
||||||
"version": "6.0.2",
|
"version": "6.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
"db:migrate": "knex migrate:latest --cwd db",
|
"db:migrate": "knex migrate:latest --cwd db",
|
||||||
"db:seed": "knex seed:run --cwd db",
|
"db:seed": "knex seed:run --cwd db",
|
||||||
"lint": "eslint . --max-warnings=0 --report-unused-disable-directives && echo '✔ Your .js files look good.'",
|
"lint": "eslint . --max-warnings=0 --report-unused-disable-directives && echo '✔ Your .js files look good.'",
|
||||||
"preinstall": "npx npm-force-resolutions",
|
|
||||||
"start": "nodemon",
|
"start": "nodemon",
|
||||||
"start:prod": "node app.js --prod",
|
"start:prod": "node app.js --prod",
|
||||||
"test": "mocha test/lifecycle.test.js test/integration/**/*.test.js test/utils/**/*.test.js"
|
"test": "mocha test/lifecycle.test.js test/integration/**/*.test.js test/utils/**/*.test.js"
|
||||||
@@ -39,7 +38,7 @@
|
|||||||
"nodemailer": "^6.9.15",
|
"nodemailer": "^6.9.15",
|
||||||
"openid-client": "^5.7.0",
|
"openid-client": "^5.7.0",
|
||||||
"rimraf": "^5.0.10",
|
"rimraf": "^5.0.10",
|
||||||
"sails": "^1.5.11",
|
"sails": "^1.5.12",
|
||||||
"sails-hook-orm": "^4.0.3",
|
"sails-hook-orm": "^4.0.3",
|
||||||
"sails-hook-sockets": "^3.0.1",
|
"sails-hook-sockets": "^3.0.1",
|
||||||
"sails-postgresql": "^5.0.1",
|
"sails-postgresql": "^5.0.1",
|
||||||
@@ -59,11 +58,6 @@
|
|||||||
"mocha": "^10.7.3",
|
"mocha": "^10.7.3",
|
||||||
"nodemon": "^3.1.4"
|
"nodemon": "^3.1.4"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
|
||||||
"body-parser": "1.20.3",
|
|
||||||
"express": "4.21.0",
|
|
||||||
"send": "0.19.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user