Compare commits
65
Commits
planka-0.1.23
...
v1.17.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e792cb26b1 | ||
|
|
7ee2d76be4 | ||
|
|
eb56b2147b | ||
|
|
8747aa59de | ||
|
|
934dcdf39b | ||
|
|
2c84316fe0 | ||
|
|
03825c3bed | ||
|
|
200ea3bbc0 | ||
|
|
5b4b0cd635 | ||
|
|
a1323cd516 | ||
|
|
92f75789fa | ||
|
|
8a8c1fee0c | ||
|
|
16499052f7 | ||
|
|
cc32daa009 | ||
|
|
ea1b3b7f92 | ||
|
|
4e2863faa7 | ||
|
|
b46fb43e6f | ||
|
|
bcacfa8fe2 | ||
|
|
4df2becd6f | ||
|
|
2990ea593a | ||
|
|
b976673826 | ||
|
|
16e034efcb | ||
|
|
6712625c3f | ||
|
|
b5bbf6a6a4 | ||
|
|
3d3e7761f5 | ||
|
|
fa56b9c01f | ||
|
|
882213784f | ||
|
|
251bd793f3 | ||
|
|
088b0e760b | ||
|
|
cc1fa1cc3b | ||
|
|
bcd3ea86e8 | ||
|
|
0176650f67 | ||
|
|
f3963aded3 | ||
|
|
bbe720481a | ||
|
|
04f9030474 | ||
|
|
6d135be859 | ||
|
|
63cbe7063e | ||
|
|
7985bea2b8 | ||
|
|
733abccaa9 | ||
|
|
119cce82b4 | ||
|
|
988e70ec40 | ||
|
|
5e3fca3771 | ||
|
|
6d9ce56f4a | ||
|
|
3c8c04fd37 | ||
|
|
790a1d5cc9 | ||
|
|
4b352fd878 | ||
|
|
a196f2ef11 | ||
|
|
6c65d135f7 | ||
|
|
a1a1e9a86a | ||
|
|
0d39a7567f | ||
|
|
76a18d06d6 | ||
|
|
ce52fc5af7 | ||
|
|
0a2863a79c | ||
|
|
39e320fe4b | ||
|
|
2f3dfe775e | ||
|
|
22964cb375 | ||
|
|
fd89cf7f2b | ||
|
|
273d994750 | ||
|
|
86d21d6abd | ||
|
|
a9c200cc3b | ||
|
|
3fedc14062 | ||
|
|
c42e1fb5dd | ||
|
|
9961340118 | ||
|
|
f54bd22757 | ||
|
|
1043dacd67 |
@@ -40,5 +40,5 @@ jobs:
|
|||||||
build-args: ALPINE_VERSION=${{ env.ALPINE_VERSION }}
|
build-args: ALPINE_VERSION=${{ env.ALPINE_VERSION }}
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
ghcr.io/plankanban/planka:base-latest
|
ghcr.io/${{ github.repository }}:base-latest
|
||||||
ghcr.io/plankanban/planka:base-${{ env.ALPINE_VERSION }}
|
ghcr.io/${{ github.repository }}:base-${{ env.ALPINE_VERSION }}
|
||||||
|
|||||||
@@ -9,99 +9,45 @@ on:
|
|||||||
- 'docker-*.sh'
|
- 'docker-*.sh'
|
||||||
- '*.md'
|
- '*.md'
|
||||||
branches: [master]
|
branches: [master]
|
||||||
|
workflow_dispatch:
|
||||||
env:
|
env:
|
||||||
REGISTRY_IMAGE: ghcr.io/plankanban/planka
|
REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
strategy:
|
runs-on: self-hosted
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- os: [self-hosted, x64]
|
|
||||||
platform: linux/amd64
|
|
||||||
- os: [self-hosted, arm64]
|
|
||||||
platform: linux/arm64
|
|
||||||
- os: [self-hosted, arm64]
|
|
||||||
platform: linux/arm/v7
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Docker meta
|
|
||||||
id: meta
|
|
||||||
uses: docker/metadata-action@v5
|
|
||||||
with:
|
|
||||||
images: ${{ env.REGISTRY_IMAGE }}
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: Build and push by digest
|
|
||||||
id: build
|
- name: Generate docker image tags
|
||||||
uses: docker/build-push-action@v5
|
id: metadata
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ env.REGISTRY_IMAGE }}
|
||||||
|
tags: |
|
||||||
|
type=raw,value=dev
|
||||||
|
|
||||||
|
- name: Build and push
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: ${{ matrix.platform }}
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
push: true
|
||||||
outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
|
tags: ${{ steps.metadata.outputs.tags }}
|
||||||
- name: Export digest
|
labels: ${{ steps.metadata.outputs.labels }}
|
||||||
run: |
|
cache-from: type=gha
|
||||||
mkdir -p /tmp/digests
|
cache-to: type=gha,mode=max
|
||||||
digest="${{ steps.build.outputs.digest }}"
|
|
||||||
touch "/tmp/digests/${digest#sha256:}"
|
|
||||||
- name: Upload digest
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: digests
|
|
||||||
path: /tmp/digests/*
|
|
||||||
if-no-files-found: error
|
|
||||||
retention-days: 1
|
|
||||||
|
|
||||||
merge:
|
|
||||||
runs-on: [self-hosted]
|
|
||||||
needs:
|
|
||||||
- build
|
|
||||||
steps:
|
|
||||||
- name: Download digests
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: digests
|
|
||||||
path: /tmp/digests
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
- name: Docker meta
|
|
||||||
id: meta
|
|
||||||
uses: docker/metadata-action@v5
|
|
||||||
with:
|
|
||||||
images: ${{ env.REGISTRY_IMAGE }}
|
|
||||||
- name: Login to GitHub Container Registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.repository_owner }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
- name: Create manifest list and push
|
|
||||||
working-directory: /tmp/digests
|
|
||||||
run: |
|
|
||||||
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
|
|
||||||
$(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
|
|
||||||
- name: Inspect image
|
|
||||||
run: |
|
|
||||||
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
|
|
||||||
rerun-failed-jobs:
|
|
||||||
runs-on: [self-hosted]
|
|
||||||
needs: [ build, merge]
|
|
||||||
if: failure()
|
|
||||||
steps:
|
|
||||||
- name: Rerun failed jobs in the current workflow
|
|
||||||
env:
|
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
run: gh run rerun ${{ github.run_id }} --failed
|
|
||||||
|
|||||||
@@ -31,12 +31,23 @@ jobs:
|
|||||||
result-encoding: string
|
result-encoding: string
|
||||||
script: return context.payload.release.tag_name.replace('v', '')
|
script: return context.payload.release.tag_name.replace('v', '')
|
||||||
|
|
||||||
|
- name: Generate docker image tags
|
||||||
|
id: metadata
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
name=ghcr.io/${{ github.repository }}
|
||||||
|
tags: |
|
||||||
|
type=raw,value=${{ steps.set-version.outputs.result }}
|
||||||
|
type=raw,value=latest
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: ${{ steps.metadata.outputs.tags }}
|
||||||
ghcr.io/plankanban/planka:latest
|
labels: ${{ steps.metadata.outputs.labels }}
|
||||||
ghcr.io/plankanban/planka:${{ steps.set-version.outputs.result }}
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
|
|||||||
@@ -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.1.23
|
version: 0.1.27
|
||||||
|
|
||||||
# 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.16.2"
|
appVersion: "1.17.0"
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- alias: postgresql
|
- alias: postgresql
|
||||||
|
|||||||
@@ -55,6 +55,11 @@ spec:
|
|||||||
- mountPath: /app/private/attachments
|
- mountPath: /app/private/attachments
|
||||||
subPath: attachments
|
subPath: attachments
|
||||||
name: planka
|
name: planka
|
||||||
|
{{- if .Values.securityContext.readOnlyRootFilesystem }}
|
||||||
|
- mountPath: /app/logs
|
||||||
|
subPath: app-logs
|
||||||
|
name: emptydir
|
||||||
|
{{- end }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.resources | nindent 12 }}
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
env:
|
env:
|
||||||
@@ -139,3 +144,7 @@ spec:
|
|||||||
{{- else }}
|
{{- else }}
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.securityContext.readOnlyRootFilesystem }}
|
||||||
|
- name: emptydir
|
||||||
|
emptyDir: {}
|
||||||
|
{{- end }}
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
REACT_APP_VERSION=1.16.2
|
REACT_APP_VERSION=1.17.0
|
||||||
|
|||||||
Generated
+16
@@ -17,6 +17,8 @@
|
|||||||
"initials": "^3.1.2",
|
"initials": "^3.1.2",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
"jwt-decode": "^4.0.0",
|
"jwt-decode": "^4.0.0",
|
||||||
|
"linkify-react": "^4.1.3",
|
||||||
|
"linkifyjs": "^4.1.3",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"nanoid": "^5.0.3",
|
"nanoid": "^5.0.3",
|
||||||
"node-sass": "^9.0.0",
|
"node-sass": "^9.0.0",
|
||||||
@@ -11911,6 +11913,20 @@
|
|||||||
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
|
||||||
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
|
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
|
||||||
},
|
},
|
||||||
|
"node_modules/linkify-react": {
|
||||||
|
"version": "4.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/linkify-react/-/linkify-react-4.1.3.tgz",
|
||||||
|
"integrity": "sha512-rhI3zM/fxn5BfRPHfi4r9N7zgac4vOIxub1wHIWXLA5ENTMs+BGaIaFO1D1PhmxgwhIKmJz3H7uCP0Dg5JwSlA==",
|
||||||
|
"peerDependencies": {
|
||||||
|
"linkifyjs": "^4.0.0",
|
||||||
|
"react": ">= 15.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/linkifyjs": {
|
||||||
|
"version": "4.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.3.tgz",
|
||||||
|
"integrity": "sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg=="
|
||||||
|
},
|
||||||
"node_modules/loader-runner": {
|
"node_modules/loader-runner": {
|
||||||
"version": "4.3.0",
|
"version": "4.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"initials": "^3.1.2",
|
"initials": "^3.1.2",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
"jwt-decode": "^4.0.0",
|
"jwt-decode": "^4.0.0",
|
||||||
|
"linkify-react": "^4.1.3",
|
||||||
|
"linkifyjs": "^4.1.3",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"nanoid": "^5.0.3",
|
"nanoid": "^5.0.3",
|
||||||
"node-sass": "^9.0.0",
|
"node-sass": "^9.0.0",
|
||||||
|
|||||||
@@ -121,6 +121,14 @@ const handleCardDelete = (card) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const filterText = (boardId, text) => ({
|
||||||
|
type: ActionTypes.TEXT_FILTER_IN_CURRENT_BOARD,
|
||||||
|
payload: {
|
||||||
|
boardId,
|
||||||
|
text,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createCard,
|
createCard,
|
||||||
handleCardCreate,
|
handleCardCreate,
|
||||||
@@ -129,4 +137,5 @@ export default {
|
|||||||
duplicateCard,
|
duplicateCard,
|
||||||
deleteCard,
|
deleteCard,
|
||||||
handleCardDelete,
|
handleCardDelete,
|
||||||
|
filterText,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -47,9 +47,11 @@ initializeCore.fetchConfig = (config) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const logout = () => ({
|
const logout = (invalidateAccessToken) => ({
|
||||||
type: ActionTypes.LOGOUT,
|
type: ActionTypes.LOGOUT,
|
||||||
payload: {},
|
payload: {
|
||||||
|
invalidateAccessToken,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
logout.invalidateAccessToken = () => ({
|
logout.invalidateAccessToken = () => ({
|
||||||
|
|||||||
@@ -60,6 +60,38 @@ const handleListUpdate = (list) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const sortList = (id, data) => ({
|
||||||
|
type: ActionTypes.LIST_SORT,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
data,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
sortList.success = (list, cards) => ({
|
||||||
|
type: ActionTypes.LIST_SORT__SUCCESS,
|
||||||
|
payload: {
|
||||||
|
list,
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
sortList.failure = (id, error) => ({
|
||||||
|
type: ActionTypes.LIST_SORT__FAILURE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleListSort = (list, cards) => ({
|
||||||
|
type: ActionTypes.LIST_SORT_HANDLE,
|
||||||
|
payload: {
|
||||||
|
list,
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteList = (id) => ({
|
const deleteList = (id) => ({
|
||||||
type: ActionTypes.LIST_DELETE,
|
type: ActionTypes.LIST_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -94,6 +126,8 @@ export default {
|
|||||||
handleListCreate,
|
handleListCreate,
|
||||||
updateList,
|
updateList,
|
||||||
handleListUpdate,
|
handleListUpdate,
|
||||||
|
sortList,
|
||||||
|
handleListSort,
|
||||||
deleteList,
|
deleteList,
|
||||||
handleListDelete,
|
handleListDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
import { transformCard } from './cards';
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
@@ -7,10 +8,33 @@ const createList = (boardId, data, headers) =>
|
|||||||
|
|
||||||
const updateList = (id, data, headers) => socket.patch(`/lists/${id}`, data, headers);
|
const updateList = (id, data, headers) => socket.patch(`/lists/${id}`, data, headers);
|
||||||
|
|
||||||
|
const sortList = (id, data, headers) =>
|
||||||
|
socket.post(`/lists/${id}/sort`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
cards: body.included.cards.map(transformCard),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
const deleteList = (id, headers) => socket.delete(`/lists/${id}`, undefined, headers);
|
const deleteList = (id, headers) => socket.delete(`/lists/${id}`, undefined, headers);
|
||||||
|
|
||||||
|
/* Event handlers */
|
||||||
|
|
||||||
|
const makeHandleListSort = (next) => (body) => {
|
||||||
|
next({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
cards: body.included.cards.map(transformCard),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createList,
|
createList,
|
||||||
updateList,
|
updateList,
|
||||||
|
sortList,
|
||||||
deleteList,
|
deleteList,
|
||||||
|
makeHandleListSort,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ const BoardActions = React.memo(
|
|||||||
labels,
|
labels,
|
||||||
filterUsers,
|
filterUsers,
|
||||||
filterLabels,
|
filterLabels,
|
||||||
|
filterText,
|
||||||
allUsers,
|
allUsers,
|
||||||
canEdit,
|
canEdit,
|
||||||
canEditMemberships,
|
canEditMemberships,
|
||||||
@@ -27,6 +28,7 @@ const BoardActions = React.memo(
|
|||||||
onLabelUpdate,
|
onLabelUpdate,
|
||||||
onLabelMove,
|
onLabelMove,
|
||||||
onLabelDelete,
|
onLabelDelete,
|
||||||
|
onTextFilterUpdate,
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
<div className={styles.wrapper}>
|
<div className={styles.wrapper}>
|
||||||
@@ -46,6 +48,7 @@ const BoardActions = React.memo(
|
|||||||
<Filters
|
<Filters
|
||||||
users={filterUsers}
|
users={filterUsers}
|
||||||
labels={filterLabels}
|
labels={filterLabels}
|
||||||
|
filterText={filterText}
|
||||||
allBoardMemberships={memberships}
|
allBoardMemberships={memberships}
|
||||||
allLabels={labels}
|
allLabels={labels}
|
||||||
canEdit={canEdit}
|
canEdit={canEdit}
|
||||||
@@ -57,6 +60,7 @@ const BoardActions = React.memo(
|
|||||||
onLabelUpdate={onLabelUpdate}
|
onLabelUpdate={onLabelUpdate}
|
||||||
onLabelMove={onLabelMove}
|
onLabelMove={onLabelMove}
|
||||||
onLabelDelete={onLabelDelete}
|
onLabelDelete={onLabelDelete}
|
||||||
|
onTextFilterUpdate={onTextFilterUpdate}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -71,6 +75,7 @@ BoardActions.propTypes = {
|
|||||||
labels: PropTypes.array.isRequired,
|
labels: PropTypes.array.isRequired,
|
||||||
filterUsers: PropTypes.array.isRequired,
|
filterUsers: PropTypes.array.isRequired,
|
||||||
filterLabels: PropTypes.array.isRequired,
|
filterLabels: PropTypes.array.isRequired,
|
||||||
|
filterText: PropTypes.string.isRequired,
|
||||||
allUsers: PropTypes.array.isRequired,
|
allUsers: PropTypes.array.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
canEdit: PropTypes.bool.isRequired,
|
canEdit: PropTypes.bool.isRequired,
|
||||||
@@ -86,6 +91,7 @@ BoardActions.propTypes = {
|
|||||||
onLabelUpdate: PropTypes.func.isRequired,
|
onLabelUpdate: PropTypes.func.isRequired,
|
||||||
onLabelMove: PropTypes.func.isRequired,
|
onLabelMove: PropTypes.func.isRequired,
|
||||||
onLabelDelete: PropTypes.func.isRequired,
|
onLabelDelete: PropTypes.func.isRequired,
|
||||||
|
onTextFilterUpdate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default BoardActions;
|
export default BoardActions;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.action {
|
.action {
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import React, { useCallback } from 'react';
|
import React, { useCallback, useRef, useState } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
import classNames from 'classnames';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Icon } from 'semantic-ui-react';
|
||||||
import { usePopup } from '../../lib/popup';
|
import { usePopup } from '../../lib/popup';
|
||||||
|
import { Input } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import User from '../User';
|
import User from '../User';
|
||||||
import Label from '../Label';
|
import Label from '../Label';
|
||||||
@@ -14,6 +17,7 @@ const Filters = React.memo(
|
|||||||
({
|
({
|
||||||
users,
|
users,
|
||||||
labels,
|
labels,
|
||||||
|
filterText,
|
||||||
allBoardMemberships,
|
allBoardMemberships,
|
||||||
allLabels,
|
allLabels,
|
||||||
canEdit,
|
canEdit,
|
||||||
@@ -25,8 +29,17 @@ const Filters = React.memo(
|
|||||||
onLabelUpdate,
|
onLabelUpdate,
|
||||||
onLabelMove,
|
onLabelMove,
|
||||||
onLabelDelete,
|
onLabelDelete,
|
||||||
|
onTextFilterUpdate,
|
||||||
}) => {
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
const [isSearchFocused, setIsSearchFocused] = useState(false);
|
||||||
|
|
||||||
|
const searchFieldRef = useRef(null);
|
||||||
|
|
||||||
|
const cancelSearch = useCallback(() => {
|
||||||
|
onTextFilterUpdate('');
|
||||||
|
searchFieldRef.current.blur();
|
||||||
|
}, [onTextFilterUpdate]);
|
||||||
|
|
||||||
const handleRemoveUserClick = useCallback(
|
const handleRemoveUserClick = useCallback(
|
||||||
(id) => {
|
(id) => {
|
||||||
@@ -42,9 +55,39 @@ const Filters = React.memo(
|
|||||||
[onLabelRemove],
|
[onLabelRemove],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handleSearchChange = useCallback(
|
||||||
|
(_, { value }) => {
|
||||||
|
onTextFilterUpdate(value);
|
||||||
|
},
|
||||||
|
[onTextFilterUpdate],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleSearchFocus = useCallback(() => {
|
||||||
|
setIsSearchFocused(true);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSearchKeyDown = useCallback(
|
||||||
|
(event) => {
|
||||||
|
if (event.key === 'Escape') {
|
||||||
|
cancelSearch();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[cancelSearch],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleSearchBlur = useCallback(() => {
|
||||||
|
setIsSearchFocused(false);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleCancelSearchClick = useCallback(() => {
|
||||||
|
cancelSearch();
|
||||||
|
}, [cancelSearch]);
|
||||||
|
|
||||||
const BoardMembershipsPopup = usePopup(BoardMembershipsStep);
|
const BoardMembershipsPopup = usePopup(BoardMembershipsStep);
|
||||||
const LabelsPopup = usePopup(LabelsStep);
|
const LabelsPopup = usePopup(LabelsStep);
|
||||||
|
|
||||||
|
const isSearchActive = filterText || isSearchFocused;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<span className={styles.filter}>
|
<span className={styles.filter}>
|
||||||
@@ -100,6 +143,25 @@ const Filters = React.memo(
|
|||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</span>
|
</span>
|
||||||
|
<span className={styles.filter}>
|
||||||
|
<Input
|
||||||
|
ref={searchFieldRef}
|
||||||
|
value={filterText}
|
||||||
|
placeholder={t('common.searchCards')}
|
||||||
|
icon={
|
||||||
|
isSearchActive ? (
|
||||||
|
<Icon link name="cancel" onClick={handleCancelSearchClick} />
|
||||||
|
) : (
|
||||||
|
'search'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
className={classNames(styles.search, !isSearchActive && styles.searchInactive)}
|
||||||
|
onFocus={handleSearchFocus}
|
||||||
|
onKeyDown={handleSearchKeyDown}
|
||||||
|
onChange={handleSearchChange}
|
||||||
|
onBlur={handleSearchBlur}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -109,6 +171,7 @@ Filters.propTypes = {
|
|||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
users: PropTypes.array.isRequired,
|
users: PropTypes.array.isRequired,
|
||||||
labels: PropTypes.array.isRequired,
|
labels: PropTypes.array.isRequired,
|
||||||
|
filterText: PropTypes.string.isRequired,
|
||||||
allBoardMemberships: PropTypes.array.isRequired,
|
allBoardMemberships: PropTypes.array.isRequired,
|
||||||
allLabels: PropTypes.array.isRequired,
|
allLabels: PropTypes.array.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
@@ -121,6 +184,7 @@ Filters.propTypes = {
|
|||||||
onLabelUpdate: PropTypes.func.isRequired,
|
onLabelUpdate: PropTypes.func.isRequired,
|
||||||
onLabelMove: PropTypes.func.isRequired,
|
onLabelMove: PropTypes.func.isRequired,
|
||||||
onLabelDelete: PropTypes.func.isRequired,
|
onLabelDelete: PropTypes.func.isRequired,
|
||||||
|
onTextFilterUpdate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Filters;
|
export default Filters;
|
||||||
|
|||||||
@@ -43,4 +43,32 @@
|
|||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
padding: 2px 12px;
|
padding: 2px 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.search {
|
||||||
|
height: 30px;
|
||||||
|
margin: 0 12px;
|
||||||
|
transition: width 0.2s ease;
|
||||||
|
width: 280px;
|
||||||
|
|
||||||
|
input {
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.searchInactive {
|
||||||
|
color: #fff;
|
||||||
|
height: 24px;
|
||||||
|
width: 220px;
|
||||||
|
|
||||||
|
input {
|
||||||
|
background: rgba(0, 0, 0, 0.24);
|
||||||
|
border: none;
|
||||||
|
color: #fff !important;
|
||||||
|
font-size: 12px;
|
||||||
|
|
||||||
|
&::placeholder {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import classNames from 'classnames';
|
|||||||
import { Progress } from 'semantic-ui-react';
|
import { Progress } from 'semantic-ui-react';
|
||||||
import { useToggle } from '../../lib/hooks';
|
import { useToggle } from '../../lib/hooks';
|
||||||
|
|
||||||
|
import Linkify from '../Linkify';
|
||||||
|
|
||||||
import styles from './Tasks.module.scss';
|
import styles from './Tasks.module.scss';
|
||||||
|
|
||||||
const Tasks = React.memo(({ items }) => {
|
const Tasks = React.memo(({ items }) => {
|
||||||
@@ -48,7 +50,7 @@ const Tasks = React.memo(({ items }) => {
|
|||||||
key={item.id}
|
key={item.id}
|
||||||
className={classNames(styles.task, item.isCompleted && styles.taskCompleted)}
|
className={classNames(styles.task, item.isCompleted && styles.taskCompleted)}
|
||||||
>
|
>
|
||||||
{item.name}
|
<Linkify linkStopPropagation>{item.name}</Linkify>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -55,8 +55,10 @@
|
|||||||
display: block;
|
display: block;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 14px;
|
line-height: 14px;
|
||||||
|
overflow: hidden;
|
||||||
padding-bottom: 6px;
|
padding-bottom: 6px;
|
||||||
padding-left: 14px;
|
padding-left: 14px;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
content: "–";
|
content: "–";
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { usePopup } from '../../../lib/popup';
|
|||||||
|
|
||||||
import NameEdit from './NameEdit';
|
import NameEdit from './NameEdit';
|
||||||
import ActionsStep from './ActionsStep';
|
import ActionsStep from './ActionsStep';
|
||||||
|
import Linkify from '../../Linkify';
|
||||||
|
|
||||||
import styles from './Item.module.scss';
|
import styles from './Item.module.scss';
|
||||||
|
|
||||||
@@ -65,7 +66,7 @@ const Item = React.memo(
|
|||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
>
|
>
|
||||||
<span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
|
<span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
|
||||||
{name}
|
<Linkify linkStopPropagation>{name}</Linkify>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
{isPersisted && canEdit && (
|
{isPersisted && canEdit && (
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { usePopup } from '../../lib/popup';
|
|||||||
|
|
||||||
import Paths from '../../constants/Paths';
|
import Paths from '../../constants/Paths';
|
||||||
import NotificationsStep from './NotificationsStep';
|
import NotificationsStep from './NotificationsStep';
|
||||||
|
import User from '../User';
|
||||||
import UserStep from '../UserStep';
|
import UserStep from '../UserStep';
|
||||||
|
|
||||||
import styles from './Header.module.scss';
|
import styles from './Header.module.scss';
|
||||||
@@ -91,7 +92,8 @@ const Header = React.memo(
|
|||||||
onLogout={onLogout}
|
onLogout={onLogout}
|
||||||
>
|
>
|
||||||
<Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
|
<Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
|
||||||
{user.name}
|
<span className={styles.userName}>{user.name}</span>
|
||||||
|
<User name={user.name} avatarUrl={user.avatarUrl} size="small" />
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</UserPopup>
|
</UserPopup>
|
||||||
</Menu.Menu>
|
</Menu.Menu>
|
||||||
|
|||||||
@@ -86,6 +86,10 @@
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.userName {
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
background: rgba(0, 0, 0, 0.24);
|
background: rgba(0, 0, 0, 0.24);
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -0,0 +1,68 @@
|
|||||||
|
import React, { useCallback } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import LinkifyReact from 'linkify-react';
|
||||||
|
|
||||||
|
import history from '../history';
|
||||||
|
|
||||||
|
const Linkify = React.memo(({ children, linkStopPropagation, ...props }) => {
|
||||||
|
const handleLinkClick = useCallback(
|
||||||
|
(event) => {
|
||||||
|
if (linkStopPropagation) {
|
||||||
|
event.stopPropagation();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!event.target.getAttribute('target')) {
|
||||||
|
event.preventDefault();
|
||||||
|
history.push(event.target.href);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[linkStopPropagation],
|
||||||
|
);
|
||||||
|
|
||||||
|
const linkRenderer = useCallback(
|
||||||
|
({ attributes: { href, ...linkProps }, content }) => {
|
||||||
|
let url;
|
||||||
|
try {
|
||||||
|
url = new URL(href, window.location);
|
||||||
|
} catch (error) {} // eslint-disable-line no-empty
|
||||||
|
|
||||||
|
const isSameSite = !!url && url.origin === window.location.origin;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<a
|
||||||
|
{...linkProps} // eslint-disable-line react/jsx-props-no-spreading
|
||||||
|
href={href}
|
||||||
|
target={isSameSite ? undefined : '_blank'}
|
||||||
|
rel={isSameSite ? undefined : 'noreferrer'}
|
||||||
|
onClick={handleLinkClick}
|
||||||
|
>
|
||||||
|
{isSameSite ? url.pathname : content}
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
[handleLinkClick],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<LinkifyReact
|
||||||
|
{...props} // eslint-disable-line react/jsx-props-no-spreading
|
||||||
|
options={{
|
||||||
|
defaultProtocol: 'https',
|
||||||
|
render: linkRenderer,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</LinkifyReact>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
Linkify.propTypes = {
|
||||||
|
children: PropTypes.string.isRequired,
|
||||||
|
linkStopPropagation: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
Linkify.defaultProps = {
|
||||||
|
linkStopPropagation: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Linkify;
|
||||||
@@ -5,15 +5,17 @@ import { Menu } from 'semantic-ui-react';
|
|||||||
import { Popup } from '../../lib/custom-ui';
|
import { Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useSteps } from '../../hooks';
|
import { useSteps } from '../../hooks';
|
||||||
|
import ListSortStep from '../ListSortStep';
|
||||||
import DeleteStep from '../DeleteStep';
|
import DeleteStep from '../DeleteStep';
|
||||||
|
|
||||||
import styles from './ActionsStep.module.scss';
|
import styles from './ActionsStep.module.scss';
|
||||||
|
|
||||||
const StepTypes = {
|
const StepTypes = {
|
||||||
DELETE: 'DELETE',
|
DELETE: 'DELETE',
|
||||||
|
SORT: 'SORT',
|
||||||
};
|
};
|
||||||
|
|
||||||
const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) => {
|
const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onSort, onDelete, onClose }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [step, openStep, handleBack] = useSteps();
|
const [step, openStep, handleBack] = useSteps();
|
||||||
|
|
||||||
@@ -27,20 +29,41 @@ const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) =>
|
|||||||
onClose();
|
onClose();
|
||||||
}, [onCardAdd, onClose]);
|
}, [onCardAdd, onClose]);
|
||||||
|
|
||||||
|
const handleSortClick = useCallback(() => {
|
||||||
|
openStep(StepTypes.SORT);
|
||||||
|
}, [openStep]);
|
||||||
|
|
||||||
const handleDeleteClick = useCallback(() => {
|
const handleDeleteClick = useCallback(() => {
|
||||||
openStep(StepTypes.DELETE);
|
openStep(StepTypes.DELETE);
|
||||||
}, [openStep]);
|
}, [openStep]);
|
||||||
|
|
||||||
if (step && step.type === StepTypes.DELETE) {
|
const handleSortTypeSelect = useCallback(
|
||||||
return (
|
(type) => {
|
||||||
<DeleteStep
|
onSort({
|
||||||
title="common.deleteList"
|
type,
|
||||||
content="common.areYouSureYouWantToDeleteThisList"
|
});
|
||||||
buttonContent="action.deleteList"
|
|
||||||
onConfirm={onDelete}
|
onClose();
|
||||||
onBack={handleBack}
|
},
|
||||||
/>
|
[onSort, onClose],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (step && step.type) {
|
||||||
|
switch (step.type) {
|
||||||
|
case StepTypes.SORT:
|
||||||
|
return <ListSortStep onTypeSelect={handleSortTypeSelect} onBack={handleBack} />;
|
||||||
|
case StepTypes.DELETE:
|
||||||
|
return (
|
||||||
|
<DeleteStep
|
||||||
|
title="common.deleteList"
|
||||||
|
content="common.areYouSureYouWantToDeleteThisList"
|
||||||
|
buttonContent="action.deleteList"
|
||||||
|
onConfirm={onDelete}
|
||||||
|
onBack={handleBack}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
default:
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -62,6 +85,11 @@ const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) =>
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
<Menu.Item className={styles.menuItem} onClick={handleSortClick}>
|
||||||
|
{t('action.sortList', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Menu.Item>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
||||||
{t('action.deleteList', {
|
{t('action.deleteList', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
@@ -77,6 +105,7 @@ ActionsStep.propTypes = {
|
|||||||
onNameEdit: PropTypes.func.isRequired,
|
onNameEdit: PropTypes.func.isRequired,
|
||||||
onCardAdd: PropTypes.func.isRequired,
|
onCardAdd: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
|
onSort: PropTypes.func.isRequired,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,18 @@ import { ReactComponent as PlusMathIcon } from '../../assets/images/plus-math-ic
|
|||||||
import styles from './List.module.scss';
|
import styles from './List.module.scss';
|
||||||
|
|
||||||
const List = React.memo(
|
const List = React.memo(
|
||||||
({ id, index, name, isPersisted, cardIds, canEdit, onUpdate, onDelete, onCardCreate }) => {
|
({
|
||||||
|
id,
|
||||||
|
index,
|
||||||
|
name,
|
||||||
|
isPersisted,
|
||||||
|
cardIds,
|
||||||
|
canEdit,
|
||||||
|
onUpdate,
|
||||||
|
onDelete,
|
||||||
|
onSort,
|
||||||
|
onCardCreate,
|
||||||
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [isAddCardOpened, setIsAddCardOpened] = useState(false);
|
const [isAddCardOpened, setIsAddCardOpened] = useState(false);
|
||||||
|
|
||||||
@@ -114,6 +125,7 @@ const List = React.memo(
|
|||||||
onNameEdit={handleNameEdit}
|
onNameEdit={handleNameEdit}
|
||||||
onCardAdd={handleCardAdd}
|
onCardAdd={handleCardAdd}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
|
onSort={onSort}
|
||||||
>
|
>
|
||||||
<Button className={classNames(styles.headerButton, styles.target)}>
|
<Button className={classNames(styles.headerButton, styles.target)}>
|
||||||
<Icon fitted name="pencil" size="small" />
|
<Icon fitted name="pencil" size="small" />
|
||||||
@@ -159,6 +171,7 @@ List.propTypes = {
|
|||||||
cardIds: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
cardIds: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
canEdit: PropTypes.bool.isRequired,
|
canEdit: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
|
onSort: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
onCardCreate: PropTypes.func.isRequired,
|
onCardCreate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Menu } from 'semantic-ui-react';
|
||||||
|
import { Popup } from '../../lib/custom-ui';
|
||||||
|
import { ListSortTypes } from '../../constants/Enums';
|
||||||
|
|
||||||
|
import styles from './ListSortStep.module.scss';
|
||||||
|
|
||||||
|
const ListSortStep = React.memo(({ onTypeSelect, onBack }) => {
|
||||||
|
const [t] = useTranslation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Popup.Header onBack={onBack}>
|
||||||
|
{t('common.sortList', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Popup.Header>
|
||||||
|
<Popup.Content>
|
||||||
|
<Menu secondary vertical className={styles.menu}>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.NAME_ASC)}
|
||||||
|
>
|
||||||
|
{t('common.title')}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.DUE_DATE_ASC)}
|
||||||
|
>
|
||||||
|
{t('common.dueDate')}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.CREATED_AT_ASC)}
|
||||||
|
>
|
||||||
|
{t('common.oldestFirst')}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.CREATED_AT_DESC)}
|
||||||
|
>
|
||||||
|
{t('common.newestFirst')}
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu>
|
||||||
|
</Popup.Content>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
ListSortStep.propTypes = {
|
||||||
|
onTypeSelect: PropTypes.func.isRequired,
|
||||||
|
onBack: PropTypes.func,
|
||||||
|
};
|
||||||
|
|
||||||
|
ListSortStep.defaultProps = {
|
||||||
|
onBack: undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ListSortStep;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
:global(#app) {
|
||||||
|
.menu {
|
||||||
|
margin: -7px -12px -5px;
|
||||||
|
width: calc(100% + 24px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItem {
|
||||||
|
margin: 0;
|
||||||
|
padding-left: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import ListSortStep from './ListSortStep';
|
||||||
|
|
||||||
|
export default ListSortStep;
|
||||||
@@ -8,6 +8,9 @@ import ActionsStep from './ActionsStep';
|
|||||||
import User from '../User';
|
import User from '../User';
|
||||||
|
|
||||||
import styles from './Memberships.module.scss';
|
import styles from './Memberships.module.scss';
|
||||||
|
import MembershipsStep from './MembershipsStep';
|
||||||
|
|
||||||
|
const MAX_MEMBERS = 6;
|
||||||
|
|
||||||
const Memberships = React.memo(
|
const Memberships = React.memo(
|
||||||
({
|
({
|
||||||
@@ -31,11 +34,14 @@ const Memberships = React.memo(
|
|||||||
}) => {
|
}) => {
|
||||||
const AddPopup = usePopup(AddStep);
|
const AddPopup = usePopup(AddStep);
|
||||||
const ActionsPopup = usePopup(ActionsStep);
|
const ActionsPopup = usePopup(ActionsStep);
|
||||||
|
const MembershipsPopup = usePopup(MembershipsStep);
|
||||||
|
|
||||||
|
const remainMembersCount = items.length - MAX_MEMBERS;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<span className={styles.users}>
|
<span className={styles.users}>
|
||||||
{items.map((item) => (
|
{items.slice(0, MAX_MEMBERS).map((item) => (
|
||||||
<span key={item.id} className={styles.user}>
|
<span key={item.id} className={styles.user}>
|
||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
membership={item}
|
membership={item}
|
||||||
@@ -63,6 +69,28 @@ const Memberships = React.memo(
|
|||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</span>
|
</span>
|
||||||
|
{remainMembersCount > 0 && (
|
||||||
|
<MembershipsPopup
|
||||||
|
items={items}
|
||||||
|
permissionsSelectStep={permissionsSelectStep}
|
||||||
|
leaveButtonContent={leaveButtonContent}
|
||||||
|
leaveConfirmationTitle={leaveConfirmationTitle}
|
||||||
|
leaveConfirmationContent={leaveConfirmationContent}
|
||||||
|
leaveConfirmationButtonContent={leaveConfirmationButtonContent}
|
||||||
|
deleteButtonContent={deleteButtonContent}
|
||||||
|
deleteConfirmationTitle={deleteConfirmationTitle}
|
||||||
|
deleteConfirmationContent={deleteConfirmationContent}
|
||||||
|
deleteConfirmationButtonContent={deleteConfirmationButtonContent}
|
||||||
|
canEdit={canEdit}
|
||||||
|
canLeave={items.length > 1 || canLeaveIfLast}
|
||||||
|
onUpdate={onUpdate}
|
||||||
|
onDelete={onDelete}
|
||||||
|
>
|
||||||
|
<Button icon className={styles.addUser}>
|
||||||
|
+ {remainMembersCount < 99 ? remainMembersCount : 99}
|
||||||
|
</Button>
|
||||||
|
</MembershipsPopup>
|
||||||
|
)}
|
||||||
{canEdit && (
|
{canEdit && (
|
||||||
<AddPopup
|
<AddPopup
|
||||||
users={allUsers}
|
users={allUsers}
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import React, { useCallback, useState } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import BoardMembershipsStep from '../BoardMembershipsStep/BoardMembershipsStep';
|
||||||
|
import ActionsStep from './ActionsStep';
|
||||||
|
import { Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
|
const MembershipsStep = React.memo(
|
||||||
|
({
|
||||||
|
items,
|
||||||
|
permissionsSelectStep,
|
||||||
|
leaveButtonContent,
|
||||||
|
leaveConfirmationTitle,
|
||||||
|
leaveConfirmationContent,
|
||||||
|
leaveConfirmationButtonContent,
|
||||||
|
deleteButtonContent,
|
||||||
|
deleteConfirmationTitle,
|
||||||
|
deleteConfirmationContent,
|
||||||
|
deleteConfirmationButtonContent,
|
||||||
|
canEdit,
|
||||||
|
canLeave,
|
||||||
|
onUpdate,
|
||||||
|
onDelete,
|
||||||
|
onClose,
|
||||||
|
}) => {
|
||||||
|
const [t] = useTranslation();
|
||||||
|
|
||||||
|
const [editingItem, setEditingItem] = useState();
|
||||||
|
|
||||||
|
const handleUserClick = useCallback(
|
||||||
|
(id) => {
|
||||||
|
setEditingItem(items.find((item) => item.user.id === id));
|
||||||
|
},
|
||||||
|
[setEditingItem, items],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (editingItem) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Popup.Header onBack={() => setEditingItem(null)}>{t('common.memberInfo')}</Popup.Header>
|
||||||
|
<Popup.Content>
|
||||||
|
<ActionsStep
|
||||||
|
membership={editingItem}
|
||||||
|
permissionsSelectStep={permissionsSelectStep}
|
||||||
|
leaveButtonContent={leaveButtonContent}
|
||||||
|
leaveConfirmationTitle={leaveConfirmationTitle}
|
||||||
|
leaveConfirmationContent={leaveConfirmationContent}
|
||||||
|
leaveConfirmationButtonContent={leaveConfirmationButtonContent}
|
||||||
|
deleteButtonContent={deleteButtonContent}
|
||||||
|
deleteConfirmationTitle={deleteConfirmationTitle}
|
||||||
|
deleteConfirmationContent={deleteConfirmationContent}
|
||||||
|
deleteConfirmationButtonContent={deleteConfirmationButtonContent}
|
||||||
|
canEdit={canEdit}
|
||||||
|
canLeave={canLeave}
|
||||||
|
onUpdate={onUpdate}
|
||||||
|
onDelete={onDelete}
|
||||||
|
onClose={onClose}
|
||||||
|
/>
|
||||||
|
</Popup.Content>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<BoardMembershipsStep
|
||||||
|
items={items}
|
||||||
|
currentUserIds={[]}
|
||||||
|
onUserSelect={handleUserClick}
|
||||||
|
onUserDeselect={() => {}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
MembershipsStep.propTypes = {
|
||||||
|
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
permissionsSelectStep: PropTypes.elementType,
|
||||||
|
leaveButtonContent: PropTypes.string,
|
||||||
|
leaveConfirmationTitle: PropTypes.string,
|
||||||
|
leaveConfirmationContent: PropTypes.string,
|
||||||
|
leaveConfirmationButtonContent: PropTypes.string,
|
||||||
|
deleteButtonContent: PropTypes.string,
|
||||||
|
deleteConfirmationTitle: PropTypes.string,
|
||||||
|
deleteConfirmationContent: PropTypes.string,
|
||||||
|
deleteConfirmationButtonContent: PropTypes.string,
|
||||||
|
canEdit: PropTypes.bool.isRequired,
|
||||||
|
canLeave: PropTypes.bool.isRequired,
|
||||||
|
onUpdate: PropTypes.func,
|
||||||
|
onDelete: PropTypes.func.isRequired,
|
||||||
|
onClose: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
MembershipsStep.defaultProps = {
|
||||||
|
permissionsSelectStep: undefined,
|
||||||
|
leaveButtonContent: 'action.leaveBoard',
|
||||||
|
leaveConfirmationTitle: 'common.leaveBoard',
|
||||||
|
leaveConfirmationContent: 'common.areYouSureYouWantToLeaveBoard',
|
||||||
|
leaveConfirmationButtonContent: 'action.leaveBoard',
|
||||||
|
deleteButtonContent: 'action.removeFromBoard',
|
||||||
|
deleteConfirmationTitle: 'common.removeMember',
|
||||||
|
deleteConfirmationContent: 'common.areYouSureYouWantToRemoveThisMemberFromBoard',
|
||||||
|
deleteConfirmationButtonContent: 'action.removeMember',
|
||||||
|
onUpdate: undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MembershipsStep;
|
||||||
@@ -173,6 +173,10 @@ export default {
|
|||||||
LIST_UPDATE__SUCCESS: 'LIST_UPDATE__SUCCESS',
|
LIST_UPDATE__SUCCESS: 'LIST_UPDATE__SUCCESS',
|
||||||
LIST_UPDATE__FAILURE: 'LIST_UPDATE__FAILURE',
|
LIST_UPDATE__FAILURE: 'LIST_UPDATE__FAILURE',
|
||||||
LIST_UPDATE_HANDLE: 'LIST_UPDATE_HANDLE',
|
LIST_UPDATE_HANDLE: 'LIST_UPDATE_HANDLE',
|
||||||
|
LIST_SORT: 'LIST_SORT',
|
||||||
|
LIST_SORT__SUCCESS: 'LIST_SORT__SUCCESS',
|
||||||
|
LIST_SORT__FAILURE: 'LIST_SORT__FAILURE',
|
||||||
|
LIST_SORT_HANDLE: 'LIST_SORT_HANDLE',
|
||||||
LIST_DELETE: 'LIST_DELETE',
|
LIST_DELETE: 'LIST_DELETE',
|
||||||
LIST_DELETE__SUCCESS: 'LIST_DELETE__SUCCESS',
|
LIST_DELETE__SUCCESS: 'LIST_DELETE__SUCCESS',
|
||||||
LIST_DELETE__FAILURE: 'LIST_DELETE__FAILURE',
|
LIST_DELETE__FAILURE: 'LIST_DELETE__FAILURE',
|
||||||
@@ -201,6 +205,7 @@ export default {
|
|||||||
CARD_DELETE__SUCCESS: 'CARD_DELETE__SUCCESS',
|
CARD_DELETE__SUCCESS: 'CARD_DELETE__SUCCESS',
|
||||||
CARD_DELETE__FAILURE: 'CARD_DELETE__FAILURE',
|
CARD_DELETE__FAILURE: 'CARD_DELETE__FAILURE',
|
||||||
CARD_DELETE_HANDLE: 'CARD_DELETE_HANDLE',
|
CARD_DELETE_HANDLE: 'CARD_DELETE_HANDLE',
|
||||||
|
TEXT_FILTER_IN_CURRENT_BOARD: 'TEXT_FILTER_IN_CURRENT_BOARD',
|
||||||
|
|
||||||
/* Tasks */
|
/* Tasks */
|
||||||
|
|
||||||
|
|||||||
@@ -120,6 +120,8 @@ export default {
|
|||||||
LIST_MOVE: `${PREFIX}/LIST_MOVE`,
|
LIST_MOVE: `${PREFIX}/LIST_MOVE`,
|
||||||
LIST_DELETE: `${PREFIX}/LIST_DELETE`,
|
LIST_DELETE: `${PREFIX}/LIST_DELETE`,
|
||||||
LIST_DELETE_HANDLE: `${PREFIX}/LIST_DELETE_HANDLE`,
|
LIST_DELETE_HANDLE: `${PREFIX}/LIST_DELETE_HANDLE`,
|
||||||
|
LIST_SORT: `${PREFIX}/LIST_SORT`,
|
||||||
|
LIST_SORT_HANDLE: `${PREFIX}/LIST_SORT_HANDLE`,
|
||||||
|
|
||||||
/* Cards */
|
/* Cards */
|
||||||
|
|
||||||
@@ -137,6 +139,7 @@ export default {
|
|||||||
CARD_DELETE: `${PREFIX}/CARD_DELETE`,
|
CARD_DELETE: `${PREFIX}/CARD_DELETE`,
|
||||||
CURRENT_CARD_DELETE: `${PREFIX}/CURRENT_CARD_DELETE`,
|
CURRENT_CARD_DELETE: `${PREFIX}/CURRENT_CARD_DELETE`,
|
||||||
CARD_DELETE_HANDLE: `${PREFIX}/CARD_DELETE_HANDLE`,
|
CARD_DELETE_HANDLE: `${PREFIX}/CARD_DELETE_HANDLE`,
|
||||||
|
TEXT_FILTER_IN_CURRENT_BOARD: `${PREFIX}/FILTER_TEXT_HANDLE`,
|
||||||
|
|
||||||
/* Tasks */
|
/* Tasks */
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,13 @@ export const BoardMembershipRoles = {
|
|||||||
VIEWER: 'viewer',
|
VIEWER: 'viewer',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const ListSortTypes = {
|
||||||
|
NAME_ASC: 'name_asc',
|
||||||
|
DUE_DATE_ASC: 'dueDate_asc',
|
||||||
|
CREATED_AT_ASC: 'createdAt_asc',
|
||||||
|
CREATED_AT_DESC: 'createdAt_desc',
|
||||||
|
};
|
||||||
|
|
||||||
export const ActivityTypes = {
|
export const ActivityTypes = {
|
||||||
CREATE_CARD: 'createCard',
|
CREATE_CARD: 'createCard',
|
||||||
MOVE_CARD: 'moveCard',
|
MOVE_CARD: 'moveCard',
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ const mapStateToProps = (state) => {
|
|||||||
const labels = selectors.selectLabelsForCurrentBoard(state);
|
const labels = selectors.selectLabelsForCurrentBoard(state);
|
||||||
const filterUsers = selectors.selectFilterUsersForCurrentBoard(state);
|
const filterUsers = selectors.selectFilterUsersForCurrentBoard(state);
|
||||||
const filterLabels = selectors.selectFilterLabelsForCurrentBoard(state);
|
const filterLabels = selectors.selectFilterLabelsForCurrentBoard(state);
|
||||||
|
const filterText = selectors.selectFilterTextForCurrentBoard(state);
|
||||||
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const isCurrentUserEditor =
|
const isCurrentUserEditor =
|
||||||
@@ -23,6 +24,7 @@ const mapStateToProps = (state) => {
|
|||||||
labels,
|
labels,
|
||||||
filterUsers,
|
filterUsers,
|
||||||
filterLabels,
|
filterLabels,
|
||||||
|
filterText,
|
||||||
allUsers,
|
allUsers,
|
||||||
canEdit: isCurrentUserEditor,
|
canEdit: isCurrentUserEditor,
|
||||||
canEditMemberships: isCurrentUserManager,
|
canEditMemberships: isCurrentUserManager,
|
||||||
@@ -43,6 +45,7 @@ const mapDispatchToProps = (dispatch) =>
|
|||||||
onLabelUpdate: entryActions.updateLabel,
|
onLabelUpdate: entryActions.updateLabel,
|
||||||
onLabelMove: entryActions.moveLabel,
|
onLabelMove: entryActions.moveLabel,
|
||||||
onLabelDelete: entryActions.deleteLabel,
|
onLabelDelete: entryActions.deleteLabel,
|
||||||
|
onTextFilterUpdate: entryActions.filterText,
|
||||||
},
|
},
|
||||||
dispatch,
|
dispatch,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ const mapDispatchToProps = (dispatch, { id }) =>
|
|||||||
bindActionCreators(
|
bindActionCreators(
|
||||||
{
|
{
|
||||||
onUpdate: (data) => entryActions.updateList(id, data),
|
onUpdate: (data) => entryActions.updateList(id, data),
|
||||||
|
onSort: (data) => entryActions.sortList(id, data),
|
||||||
onDelete: () => entryActions.deleteList(id),
|
onDelete: () => entryActions.deleteList(id),
|
||||||
onCardCreate: (data, autoOpen) => entryActions.createCard(id, data, autoOpen),
|
onCardCreate: (data, autoOpen) => entryActions.createCard(id, data, autoOpen),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const mapStateToProps = (state) => {
|
|||||||
isSubmittingUsingOidc,
|
isSubmittingUsingOidc,
|
||||||
error,
|
error,
|
||||||
withOidc: !!oidcConfig,
|
withOidc: !!oidcConfig,
|
||||||
isOidcEnforced: oidcConfig && oidcConfig.isEnforced,
|
isOidcEnforced: !!oidcConfig && oidcConfig.isEnforced,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ const handleCardUpdate = (card) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const moveCard = (id, listId, index = 0) => ({
|
const moveCard = (id, listId, index) => ({
|
||||||
type: EntryActionTypes.CARD_MOVE,
|
type: EntryActionTypes.CARD_MOVE,
|
||||||
payload: {
|
payload: {
|
||||||
id,
|
id,
|
||||||
@@ -47,7 +47,7 @@ const moveCard = (id, listId, index = 0) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const moveCurrentCard = (listId, index = 0) => ({
|
const moveCurrentCard = (listId, index) => ({
|
||||||
type: EntryActionTypes.CURRENT_CARD_MOVE,
|
type: EntryActionTypes.CURRENT_CARD_MOVE,
|
||||||
payload: {
|
payload: {
|
||||||
listId,
|
listId,
|
||||||
@@ -55,7 +55,7 @@ const moveCurrentCard = (listId, index = 0) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const transferCard = (id, boardId, listId, index = 0) => ({
|
const transferCard = (id, boardId, listId, index) => ({
|
||||||
type: EntryActionTypes.CARD_TRANSFER,
|
type: EntryActionTypes.CARD_TRANSFER,
|
||||||
payload: {
|
payload: {
|
||||||
id,
|
id,
|
||||||
@@ -65,7 +65,7 @@ const transferCard = (id, boardId, listId, index = 0) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const transferCurrentCard = (boardId, listId, index = 0) => ({
|
const transferCurrentCard = (boardId, listId, index) => ({
|
||||||
type: EntryActionTypes.CURRENT_CARD_TRANSFER,
|
type: EntryActionTypes.CURRENT_CARD_TRANSFER,
|
||||||
payload: {
|
payload: {
|
||||||
boardId,
|
boardId,
|
||||||
@@ -105,6 +105,13 @@ const handleCardDelete = (card) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const filterText = (text) => ({
|
||||||
|
type: EntryActionTypes.TEXT_FILTER_IN_CURRENT_BOARD,
|
||||||
|
payload: {
|
||||||
|
text,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createCard,
|
createCard,
|
||||||
handleCardCreate,
|
handleCardCreate,
|
||||||
@@ -120,4 +127,5 @@ export default {
|
|||||||
deleteCard,
|
deleteCard,
|
||||||
deleteCurrentCard,
|
deleteCurrentCard,
|
||||||
handleCardDelete,
|
handleCardDelete,
|
||||||
|
filterText,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import EntryActionTypes from '../constants/EntryActionTypes';
|
import EntryActionTypes from '../constants/EntryActionTypes';
|
||||||
|
|
||||||
const logout = () => ({
|
const logout = (invalidateAccessToken) => ({
|
||||||
type: EntryActionTypes.LOGOUT,
|
type: EntryActionTypes.LOGOUT,
|
||||||
payload: {},
|
payload: {
|
||||||
|
invalidateAccessToken,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -37,6 +37,24 @@ const moveList = (id, index) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const sortList = (id, data) => {
|
||||||
|
return {
|
||||||
|
type: EntryActionTypes.LIST_SORT,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
data,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleListSort = (list, cards) => ({
|
||||||
|
type: EntryActionTypes.LIST_SORT_HANDLE,
|
||||||
|
payload: {
|
||||||
|
list,
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteList = (id) => ({
|
const deleteList = (id) => ({
|
||||||
type: EntryActionTypes.LIST_DELETE,
|
type: EntryActionTypes.LIST_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -57,6 +75,8 @@ export default {
|
|||||||
updateList,
|
updateList,
|
||||||
handleListUpdate,
|
handleListUpdate,
|
||||||
moveList,
|
moveList,
|
||||||
|
sortList,
|
||||||
|
handleListSort,
|
||||||
deleteList,
|
deleteList,
|
||||||
handleListDelete,
|
handleListDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,4 +9,6 @@ export default class Input extends SemanticUIInput {
|
|||||||
static Mask = InputMask;
|
static Mask = InputMask;
|
||||||
|
|
||||||
focus = (options) => this.inputRef.current.focus(options);
|
focus = (options) => this.inputRef.current.focus(options);
|
||||||
|
|
||||||
|
blur = () => this.inputRef.current.blur();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,9 +39,9 @@ export default {
|
|||||||
areYouSureYouWantToLeaveBoard: 'Opravdu chcete opustit tuto tabuli?',
|
areYouSureYouWantToLeaveBoard: 'Opravdu chcete opustit tuto tabuli?',
|
||||||
areYouSureYouWantToLeaveProject: 'Opravdu chcete opustit projekt?',
|
areYouSureYouWantToLeaveProject: 'Opravdu chcete opustit projekt?',
|
||||||
areYouSureYouWantToRemoveThisManagerFromProject:
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
'Are you sure you want to remove this manager from the project?',
|
'Jste si jisti, že chcete tohoto správce z projektu odebrat?',
|
||||||
areYouSureYouWantToRemoveThisMemberFromBoard:
|
areYouSureYouWantToRemoveThisMemberFromBoard:
|
||||||
'Opravdu chcete odstranit tohoto člena z tabule?',
|
'Jste si jisti, že chcete tohoto člena odebrat z tabule?',
|
||||||
attachment: 'Příloha',
|
attachment: 'Příloha',
|
||||||
attachments: 'Přílohy',
|
attachments: 'Přílohy',
|
||||||
authentication: 'Ověření',
|
authentication: 'Ověření',
|
||||||
@@ -55,6 +55,7 @@ export default {
|
|||||||
cardNotFound_title: 'Karta nenalezena',
|
cardNotFound_title: 'Karta nenalezena',
|
||||||
cardOrActionAreDeleted: 'Karta nebo akce je smazána.',
|
cardOrActionAreDeleted: 'Karta nebo akce je smazána.',
|
||||||
color: 'Barva',
|
color: 'Barva',
|
||||||
|
copy_inline: 'copy',
|
||||||
createBoard_title: 'Vytvořit tabuli',
|
createBoard_title: 'Vytvořit tabuli',
|
||||||
createLabel_title: 'Vytvořit štítek',
|
createLabel_title: 'Vytvořit štítek',
|
||||||
createNewOneOrSelectExistingOne: 'Vytvořit nový nebo vyberte<br />již existující.',
|
createNewOneOrSelectExistingOne: 'Vytvořit nový nebo vyberte<br />již existující.',
|
||||||
@@ -130,7 +131,7 @@ export default {
|
|||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Volby',
|
preferences: 'Volby',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: dejte Ctrl-V (Cmd-V na Mac) pro vložení přílohy ze schránky.',
|
'Tip: stisknutím Ctrl-V (Cmd-V na Mac) přidáte přílohu ze schránky.',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt nenalezen',
|
projectNotFound_title: 'Projekt nenalezen',
|
||||||
removeManager_title: 'Odstranit vedoucího',
|
removeManager_title: 'Odstranit vedoucího',
|
||||||
@@ -199,6 +200,8 @@ export default {
|
|||||||
deleteTask: 'Smazat úkol',
|
deleteTask: 'Smazat úkol',
|
||||||
deleteTask_title: 'Smazat úkol',
|
deleteTask_title: 'Smazat úkol',
|
||||||
deleteUser: 'Smazat uživatele',
|
deleteUser: 'Smazat uživatele',
|
||||||
|
duplicate: 'Duplikovat',
|
||||||
|
duplicateCard_title: 'Duplikovat kartu',
|
||||||
edit: 'Upravit',
|
edit: 'Upravit',
|
||||||
editDueDate_title: 'Upravit termín do',
|
editDueDate_title: 'Upravit termín do',
|
||||||
editDescription_title: 'Upravit popis',
|
editDescription_title: 'Upravit popis',
|
||||||
@@ -226,13 +229,13 @@ export default {
|
|||||||
removeMember: 'Odstranit člena',
|
removeMember: 'Odstranit člena',
|
||||||
save: 'Uložit',
|
save: 'Uložit',
|
||||||
showAllAttachments: 'Zozbrazit všechny přílohy ({{hidden}} skryté)',
|
showAllAttachments: 'Zozbrazit všechny přílohy ({{hidden}} skryté)',
|
||||||
showFewerAttachments: 'Zobrazit méně příloh',
|
|
||||||
showDetails: 'Zobrazit detaily',
|
showDetails: 'Zobrazit detaily',
|
||||||
|
showFewerAttachments: 'Zobrazit méně příloh',
|
||||||
start: 'Start',
|
start: 'Start',
|
||||||
stop: 'Stop',
|
stop: 'Stop',
|
||||||
subscribe: 'Odebírat',
|
subscribe: 'Odebírat',
|
||||||
unsubscribe: 'Neodebírat',
|
unsubscribe: 'Neodebírat',
|
||||||
uploadNewAvatar: 'Nahrát nového avatara',
|
uploadNewAvatar: 'Nahrát nový avatar',
|
||||||
uploadNewImage: 'Nahrát nový obrázek',
|
uploadNewImage: 'Nahrát nový obrázek',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ export default {
|
|||||||
currentPassword: 'Current password',
|
currentPassword: 'Current password',
|
||||||
dangerZone_title: 'Danger Zone',
|
dangerZone_title: 'Danger Zone',
|
||||||
date: 'Date',
|
date: 'Date',
|
||||||
|
dueDate: 'Due date',
|
||||||
dueDate_title: 'Due Date',
|
dueDate_title: 'Due Date',
|
||||||
deleteAttachment_title: 'Delete Attachment',
|
deleteAttachment_title: 'Delete Attachment',
|
||||||
deleteBoard_title: 'Delete Board',
|
deleteBoard_title: 'Delete Board',
|
||||||
@@ -108,10 +109,12 @@ export default {
|
|||||||
list: 'List',
|
list: 'List',
|
||||||
listActions_title: 'List Actions',
|
listActions_title: 'List Actions',
|
||||||
managers: 'Managers',
|
managers: 'Managers',
|
||||||
|
memberInfo: 'Member Info',
|
||||||
members: 'Members',
|
members: 'Members',
|
||||||
minutes: 'Minutes',
|
minutes: 'Minutes',
|
||||||
moveCard_title: 'Move Card',
|
moveCard_title: 'Move Card',
|
||||||
name: 'Name',
|
name: 'Name',
|
||||||
|
newestFirst: 'Newest first',
|
||||||
newEmail: 'New e-mail',
|
newEmail: 'New e-mail',
|
||||||
newPassword: 'New password',
|
newPassword: 'New password',
|
||||||
newUsername: 'New username',
|
newUsername: 'New username',
|
||||||
@@ -121,6 +124,7 @@ export default {
|
|||||||
noProjects: 'No projects',
|
noProjects: 'No projects',
|
||||||
notifications: 'Notifications',
|
notifications: 'Notifications',
|
||||||
noUnreadNotifications: 'No unread notifications.',
|
noUnreadNotifications: 'No unread notifications.',
|
||||||
|
oldestFirst: 'Oldest first',
|
||||||
openBoard_title: 'Open Board',
|
openBoard_title: 'Open Board',
|
||||||
optional_inline: 'optional',
|
optional_inline: 'optional',
|
||||||
organization: 'Organization',
|
organization: 'Organization',
|
||||||
@@ -135,12 +139,14 @@ export default {
|
|||||||
searchLabels: 'Search labels...',
|
searchLabels: 'Search labels...',
|
||||||
searchMembers: 'Search members...',
|
searchMembers: 'Search members...',
|
||||||
searchUsers: 'Search users...',
|
searchUsers: 'Search users...',
|
||||||
|
searchCards: 'Search cards...',
|
||||||
seconds: 'Seconds',
|
seconds: 'Seconds',
|
||||||
selectBoard: 'Select board',
|
selectBoard: 'Select board',
|
||||||
selectList: 'Select list',
|
selectList: 'Select list',
|
||||||
selectPermissions_title: 'Select Permissions',
|
selectPermissions_title: 'Select Permissions',
|
||||||
selectProject: 'Select project',
|
selectProject: 'Select project',
|
||||||
settings: 'Settings',
|
settings: 'Settings',
|
||||||
|
sortList_title: 'Sort List',
|
||||||
stopwatch: 'Stopwatch',
|
stopwatch: 'Stopwatch',
|
||||||
subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
|
subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
|
||||||
taskActions_title: 'Task Actions',
|
taskActions_title: 'Task Actions',
|
||||||
@@ -228,6 +234,7 @@ export default {
|
|||||||
showAllAttachments: 'Show all attachments ({{hidden}} hidden)',
|
showAllAttachments: 'Show all attachments ({{hidden}} hidden)',
|
||||||
showDetails: 'Show details',
|
showDetails: 'Show details',
|
||||||
showFewerAttachments: 'Show fewer attachments',
|
showFewerAttachments: 'Show fewer attachments',
|
||||||
|
sortList_title: 'Sort List',
|
||||||
start: 'Start',
|
start: 'Start',
|
||||||
stop: 'Stop',
|
stop: 'Stop',
|
||||||
subscribe: 'Subscribe',
|
subscribe: 'Subscribe',
|
||||||
|
|||||||
@@ -111,6 +111,10 @@ export default {
|
|||||||
project: 'Projet',
|
project: 'Projet',
|
||||||
projectNotFound_title: 'Projet introuvable',
|
projectNotFound_title: 'Projet introuvable',
|
||||||
removeMember_title: 'Supprimer le membre',
|
removeMember_title: 'Supprimer le membre',
|
||||||
|
searchLabels: 'Chercher une étiquette...',
|
||||||
|
searchMembers: 'Chercher un membre...',
|
||||||
|
searchUsers: 'Chercher un utilisateur...',
|
||||||
|
searchCards: 'Chercher une carte...',
|
||||||
seconds: 'Secondes',
|
seconds: 'Secondes',
|
||||||
selectBoard: 'Sélectionner une carte',
|
selectBoard: 'Sélectionner une carte',
|
||||||
selectList: 'Sélectionner une liste',
|
selectList: 'Sélectionner une liste',
|
||||||
|
|||||||
@@ -0,0 +1,231 @@
|
|||||||
|
import dateFns from 'date-fns/locale/hu';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
dateFns,
|
||||||
|
|
||||||
|
format: {
|
||||||
|
date: 'yyyy.M.d.',
|
||||||
|
time: 'p',
|
||||||
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
|
longDate: 'MMM. d.',
|
||||||
|
longDateTime: 'MMMM. d. p',
|
||||||
|
fullDate: 'y. MMM d.',
|
||||||
|
fullDateTime: 'y. MMMM d. p',
|
||||||
|
},
|
||||||
|
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
|
'Az összes változás automatikusan mentésre kerül a kapcsolat helyreállása után.',
|
||||||
|
areYouSureYouWantToDeleteThisAttachment: 'Biztosan törölni szeretné ezt a mellékletet?',
|
||||||
|
areYouSureYouWantToDeleteThisBoard: 'Biztosan törölni szeretné ezt a táblát?',
|
||||||
|
areYouSureYouWantToDeleteThisCard: 'Biztosan törölni szeretné ezt a kártyát?',
|
||||||
|
areYouSureYouWantToDeleteThisComment: 'Biztosan törölni szeretné ezt a megjegyzést?',
|
||||||
|
areYouSureYouWantToDeleteThisLabel: 'Biztosan törölni szeretné ezt a címkét?',
|
||||||
|
areYouSureYouWantToDeleteThisList: 'Biztosan törölni szeretné ezt a listát?',
|
||||||
|
areYouSureYouWantToDeleteThisProject: 'Biztosan törölni szeretné ezt a projektet?',
|
||||||
|
areYouSureYouWantToDeleteThisTask: 'Biztosan törölni szeretné ezt a feladatot?',
|
||||||
|
areYouSureYouWantToDeleteThisUser: 'Biztosan törölni szeretné ezt a felhasználót?',
|
||||||
|
areYouSureYouWantToLeaveBoard: 'Biztosan el akarja hagyni a táblát?',
|
||||||
|
areYouSureYouWantToLeaveProject: 'Biztosan el akarja hagyni a projektet?',
|
||||||
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
|
'Biztosan eltávolítja ezt a vezetőt a projektből?',
|
||||||
|
areYouSureYouWantToRemoveThisMemberFromBoard: 'Biztosan eltávolítja ezt a tagot a tábláról?',
|
||||||
|
attachment: 'Melléklet',
|
||||||
|
attachments: 'Mellékletek',
|
||||||
|
authentication: 'Hitelesítés',
|
||||||
|
background: 'Háttér',
|
||||||
|
board: 'Tábla',
|
||||||
|
boardNotFound_title: 'Tábla nem található',
|
||||||
|
canComment: 'Hozzászólhat',
|
||||||
|
canEditContentOfBoard: 'Szerkesztheti a tábla tartalmát.',
|
||||||
|
canOnlyViewBoard: 'Csak megtekintheti a táblát.',
|
||||||
|
cardActions_title: 'Kártya műveletek',
|
||||||
|
cardNotFound_title: 'Kártya nem található',
|
||||||
|
cardOrActionAreDeleted: 'A kártya vagy művelet törölve lett.',
|
||||||
|
color: 'Szín',
|
||||||
|
createBoard_title: 'Tábla létrehozása',
|
||||||
|
createLabel_title: 'Címke létrehozása',
|
||||||
|
createNewOneOrSelectExistingOne: 'Hozzon létre egy újat, vagy válasszon ki egy meglévőt.',
|
||||||
|
createProject_title: 'Projekt létrehozása',
|
||||||
|
createTextFile_title: 'Szövegfájl létrehozása',
|
||||||
|
currentPassword: 'Jelenlegi jelszó',
|
||||||
|
dangerZone_title: 'Veszélyzóna',
|
||||||
|
date: 'Dátum',
|
||||||
|
dueDate_title: 'Esedékesség dátuma',
|
||||||
|
deleteAttachment_title: 'Melléklet törlése',
|
||||||
|
deleteBoard_title: 'Tábla törlése',
|
||||||
|
deleteCard_title: 'Kártya törlése',
|
||||||
|
deleteComment_title: 'Megjegyzés törlése',
|
||||||
|
deleteLabel_title: 'Címke törlése',
|
||||||
|
deleteList_title: 'Lista törlése',
|
||||||
|
deleteProject_title: 'Projekt törlése',
|
||||||
|
deleteTask_title: 'Feladat törlése',
|
||||||
|
deleteUser_title: 'Felhasználó törlése',
|
||||||
|
description: 'Leírás',
|
||||||
|
detectAutomatically: 'Automatikus érzékelés',
|
||||||
|
dropFileToUpload: 'Dobja ide a fájlt a feltöltéshez',
|
||||||
|
editor: 'Szerkesztő',
|
||||||
|
editAttachment_title: 'Melléklet szerkesztése',
|
||||||
|
editAvatar_title: 'Avatar szerkesztése',
|
||||||
|
editBoard_title: 'Tábla szerkesztése',
|
||||||
|
editDueDate_title: 'Esedékesség dátumának szerkesztése',
|
||||||
|
editEmail_title: 'E-mail szerkesztése',
|
||||||
|
editInformation_title: 'Információ szerkesztése',
|
||||||
|
editLabel_title: 'Címke szerkesztése',
|
||||||
|
editPassword_title: 'Jelszó szerkesztése',
|
||||||
|
editPermissions_title: 'Jogosultságok szerkesztése',
|
||||||
|
editStopwatch_title: 'Stopper szerkesztése',
|
||||||
|
editUsername_title: 'Felhasználónév szerkesztése',
|
||||||
|
email: 'E-mail',
|
||||||
|
emailAlreadyInUse: 'Az e-mail cím már használatban van',
|
||||||
|
enterCardTitle: 'Adja meg a kártya címét... [Ctrl+Enter] az automatikus megnyitáshoz.',
|
||||||
|
enterDescription: 'Adja meg a leírást...',
|
||||||
|
enterFilename: 'Adja meg a fájl nevét',
|
||||||
|
enterListTitle: 'Adja meg a lista címét...',
|
||||||
|
enterProjectTitle: 'Adja meg a projekt címét',
|
||||||
|
enterTaskDescription: 'Adja meg a feladat leírását...',
|
||||||
|
filterByLabels_title: 'Szűrés címkék alapján',
|
||||||
|
filterByMembers_title: 'Szűrés tagok alapján',
|
||||||
|
fromComputer_title: 'Számítógépről',
|
||||||
|
fromTrello: 'Trello-ról',
|
||||||
|
general: 'Általános',
|
||||||
|
hours: 'Órák',
|
||||||
|
importBoard_title: 'Tábla importálása',
|
||||||
|
invalidCurrentPassword: 'Érvénytelen jelenlegi jelszó',
|
||||||
|
labels: 'Címkék',
|
||||||
|
language: 'Nyelv',
|
||||||
|
leaveBoard_title: 'Tábla elhagyása',
|
||||||
|
leaveProject_title: 'Projekt elhagyása',
|
||||||
|
list: 'Lista',
|
||||||
|
listActions_title: 'Lista műveletek',
|
||||||
|
managers: 'Vezetők',
|
||||||
|
members: 'Tagok',
|
||||||
|
minutes: 'Percek',
|
||||||
|
moveCard_title: 'Kártya áthelyezése',
|
||||||
|
name: 'Név',
|
||||||
|
newEmail: 'Új e-mail',
|
||||||
|
newPassword: 'Új jelszó',
|
||||||
|
newUsername: 'Új felhasználónév',
|
||||||
|
noConnectionToServer: 'Nincs kapcsolat a szerverrel',
|
||||||
|
noBoards: 'Nincsenek táblák',
|
||||||
|
noLists: 'Nincsenek listák',
|
||||||
|
noProjects: 'Nincsenek projektek',
|
||||||
|
notifications: 'Értesítések',
|
||||||
|
noUnreadNotifications: 'Nincsenek olvasatlan értesítések.',
|
||||||
|
openBoard_title: 'Tábla megnyitása',
|
||||||
|
optional_inline: 'opcionális',
|
||||||
|
organization: 'Szervezet',
|
||||||
|
phone: 'Telefon',
|
||||||
|
preferences: 'Beállítások',
|
||||||
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
|
'Tipp: nyomja meg a Ctrl-V (Cmd-V a Mac-en) billentyűkombinációt a vágólapról történő melléklet hozzáadásához.',
|
||||||
|
project: 'Projekt',
|
||||||
|
projectNotFound_title: 'Projekt nem található',
|
||||||
|
removeManager_title: 'Vezető eltávolítása',
|
||||||
|
removeMember_title: 'Tag eltávolítása',
|
||||||
|
searchLabels: 'Címkék keresése...',
|
||||||
|
searchMembers: 'Tagok keresése...',
|
||||||
|
searchUsers: 'Felhasználók keresése...',
|
||||||
|
seconds: 'Másodpercek',
|
||||||
|
selectBoard: 'Válassza ki a táblát',
|
||||||
|
selectList: 'Válassza ki a listát',
|
||||||
|
selectPermissions_title: 'Jogosultságok kiválasztása',
|
||||||
|
selectProject: 'Válassza ki a projektet',
|
||||||
|
settings: 'Beállítások',
|
||||||
|
stopwatch: 'Stopper',
|
||||||
|
subscribeToMyOwnCardsByDefault: 'Alapértelmezés szerint feliratkozás a saját kártyáimra',
|
||||||
|
taskActions_title: 'Feladat műveletek',
|
||||||
|
tasks: 'Feladatok',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment: 'Nincs elérhető előnézet ehhez a melléklethez.',
|
||||||
|
time: 'Idő',
|
||||||
|
title: 'Cím',
|
||||||
|
userActions_title: 'Felhasználói műveletek',
|
||||||
|
userAddedThisCardToList:
|
||||||
|
'<0>{{user}}</0><1> hozzáadta ezt a kártyát a következőhöz: {{list}}</1>',
|
||||||
|
userLeftNewCommentToCard:
|
||||||
|
'{{user}} új kommentet hagyott itt: «{{comment}}» a következő kártyán: <2>{{card}}</2>',
|
||||||
|
userMovedCardFromListToList:
|
||||||
|
'{{user}} áthelyezte ezt a kártyát innen: {{fromList}} ide: {{toList}}',
|
||||||
|
userMovedThisCardFromListToList:
|
||||||
|
'<0>{{user}}</0><1> áthelyezte ezt a kártyát innen: {{fromList}} ide: {{toList}}</1>',
|
||||||
|
username: 'Felhasználónév',
|
||||||
|
usernameAlreadyInUse: 'A felhasználónév már használatban van',
|
||||||
|
users: 'Felhasználók',
|
||||||
|
version: 'Verzió',
|
||||||
|
viewer: 'Néző',
|
||||||
|
writeComment: 'Írjon egy megjegyzést...',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
addAnotherCard: 'Új kártya hozzáadása',
|
||||||
|
addAnotherList: 'Új lista hozzáadása',
|
||||||
|
addAnotherTask: 'Új feladat hozzáadása',
|
||||||
|
addCard: 'Kártya hozzáadása',
|
||||||
|
addCard_title: 'Kártya hozzáadása',
|
||||||
|
addComment: 'Megjegyzés hozzáadása',
|
||||||
|
addList: 'Lista hozzáadása',
|
||||||
|
addMember: 'Tag hozzáadása',
|
||||||
|
addMoreDetailedDescription: 'További részletes leírás hozzáadása',
|
||||||
|
addTask: 'Feladat hozzáadása',
|
||||||
|
addToCard: 'Kártyához hozzáadása',
|
||||||
|
addUser: 'Felhasználó hozzáadása',
|
||||||
|
createBoard: 'Tábla létrehozása',
|
||||||
|
createFile: 'Fájl létrehozása',
|
||||||
|
createLabel: 'Címke létrehozása',
|
||||||
|
createNewLabel: 'Új címke létrehozása',
|
||||||
|
createProject: 'Projekt létrehozása',
|
||||||
|
delete: 'Törlés',
|
||||||
|
deleteAttachment: 'Melléklet törlése',
|
||||||
|
deleteAvatar: 'Avatar törlése',
|
||||||
|
deleteBoard: 'Tábla törlése',
|
||||||
|
deleteCard: 'Kártya törlése',
|
||||||
|
deleteCard_title: 'Kártya törlése',
|
||||||
|
deleteComment: 'Megjegyzés törlése',
|
||||||
|
deleteImage: 'Kép törlése',
|
||||||
|
deleteLabel: 'Címke törlése',
|
||||||
|
deleteList: 'Lista törlése',
|
||||||
|
deleteList_title: 'Lista törlése',
|
||||||
|
deleteProject: 'Projekt törlése',
|
||||||
|
deleteProject_title: 'Projekt törlése',
|
||||||
|
deleteTask: 'Feladat törlése',
|
||||||
|
deleteTask_title: 'Feladat törlése',
|
||||||
|
deleteUser: 'Felhasználó törlése',
|
||||||
|
edit: 'Szerkesztés',
|
||||||
|
editDueDate_title: 'Esedékesség dátumának szerkesztése',
|
||||||
|
editDescription_title: 'Leírás szerkesztése',
|
||||||
|
editEmail_title: 'E-mail szerkesztése',
|
||||||
|
editInformation_title: 'Információ szerkesztése',
|
||||||
|
editPassword_title: 'Jelszó szerkesztése',
|
||||||
|
editPermissions: 'Jogosultságok szerkesztése',
|
||||||
|
editStopwatch_title: 'Stopper szerkesztése',
|
||||||
|
editTitle_title: 'Cím szerkesztése',
|
||||||
|
editUsername_title: 'Felhasználónév szerkesztése',
|
||||||
|
hideDetails: 'Részletek elrejtése',
|
||||||
|
import: 'Importálás',
|
||||||
|
leaveBoard: 'Tábla elhagyása',
|
||||||
|
leaveProject: 'Projekt elhagyása',
|
||||||
|
logOut_title: 'Kijelentkezés',
|
||||||
|
makeCover_title: 'Borító készítése',
|
||||||
|
move: 'Áthelyezés',
|
||||||
|
moveCard_title: 'Kártya áthelyezése',
|
||||||
|
remove: 'Eltávolítás',
|
||||||
|
removeBackground: 'Háttér eltávolítása',
|
||||||
|
removeCover_title: 'Borító eltávolítása',
|
||||||
|
removeFromBoard: 'Eltávolítás a tábláról',
|
||||||
|
removeFromProject: 'Eltávolítás a projektről',
|
||||||
|
removeManager: 'Vezető eltávolítása',
|
||||||
|
removeMember: 'Tag eltávolítása',
|
||||||
|
save: 'Mentés',
|
||||||
|
showAllAttachments: 'Összes melléklet megjelenítése ({{hidden}} rejtve)',
|
||||||
|
showDetails: 'Részletek megjelenítése',
|
||||||
|
showFewerAttachments: 'Kevesebb melléklet megjelenítése',
|
||||||
|
start: 'Indítás',
|
||||||
|
stop: 'Megállítás',
|
||||||
|
subscribe: 'Feliratkozás',
|
||||||
|
unsubscribe: 'Leiratkozás',
|
||||||
|
uploadNewAvatar: 'Új avatar feltöltése',
|
||||||
|
uploadNewImage: 'Új kép feltöltése',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
import login from './login';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
language: 'hu',
|
||||||
|
country: 'hu',
|
||||||
|
name: 'Magyar',
|
||||||
|
embeddedLocale: login,
|
||||||
|
};
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
export default {
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
emailOrUsername: 'E-mail vagy felhasználó',
|
||||||
|
invalidEmailOrUsername: 'Érvénytelen e-mail vagy felhasználó',
|
||||||
|
invalidPassword: 'Érvénytelen jelszó',
|
||||||
|
logInToPlanka: 'Plankába belépés',
|
||||||
|
noInternetConnection: 'Nincs internet kapcsolat',
|
||||||
|
pageNotFound_title: 'Az oldal nem található',
|
||||||
|
password: 'Jelszó',
|
||||||
|
projectManagement: 'Projektmenedzsment',
|
||||||
|
serverConnectionFailed: 'A szerverkapcsolat sikertelen',
|
||||||
|
unknownError: 'Ismeretlen hiba, próbáld meg később újra',
|
||||||
|
useSingleSignOn: 'Egyszeri bejelentkezés használata',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
logIn: 'Belépés',
|
||||||
|
logInWithSSO: 'Belépés SSO-val',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -4,6 +4,7 @@ import de from './de';
|
|||||||
import en from './en';
|
import en from './en';
|
||||||
import es from './es';
|
import es from './es';
|
||||||
import fr from './fr';
|
import fr from './fr';
|
||||||
|
import hu from './hu';
|
||||||
import id from './id';
|
import id from './id';
|
||||||
import it from './it';
|
import it from './it';
|
||||||
import ja from './ja';
|
import ja from './ja';
|
||||||
@@ -27,6 +28,7 @@ const locales = [
|
|||||||
en,
|
en,
|
||||||
es,
|
es,
|
||||||
fr,
|
fr,
|
||||||
|
hu,
|
||||||
id,
|
id,
|
||||||
it,
|
it,
|
||||||
ja,
|
ja,
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ export default {
|
|||||||
date: 'd/M/yyyy',
|
date: 'd/M/yyyy',
|
||||||
time: 'p',
|
time: 'p',
|
||||||
dateTime: '$t(format:date) $t(format:time)',
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
longDate: 'MMM d',
|
longDate: 'd MMM',
|
||||||
longDateTime: "MMMM d 'at' p",
|
longDateTime: "d MMMM 'alle' p",
|
||||||
fullDate: 'MMM d, y',
|
fullDate: 'd MMM, y',
|
||||||
fullDateTime: "MMMM d, y 'at' p",
|
fullDateTime: "d MMMM, y 'alle' p",
|
||||||
},
|
},
|
||||||
|
|
||||||
translation: {
|
translation: {
|
||||||
@@ -21,7 +21,7 @@ export default {
|
|||||||
administrator: 'Amministratore',
|
administrator: 'Amministratore',
|
||||||
all: 'tutto',
|
all: 'tutto',
|
||||||
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
'All changes will be automatically saved<br />after connection restored.',
|
'Tutte le modifiche verranno salvate<br />al ripristino della connessione.',
|
||||||
areYouSureYouWantToDeleteThisAttachment: 'Sei sicuro di voler eliminare questo allegato?',
|
areYouSureYouWantToDeleteThisAttachment: 'Sei sicuro di voler eliminare questo allegato?',
|
||||||
areYouSureYouWantToDeleteThisBoard: 'Sei sicuro di voler eliminare questa bacheca?',
|
areYouSureYouWantToDeleteThisBoard: 'Sei sicuro di voler eliminare questa bacheca?',
|
||||||
areYouSureYouWantToDeleteThisCard: 'Sei sicuro di voler eliminare questa card?',
|
areYouSureYouWantToDeleteThisCard: 'Sei sicuro di voler eliminare questa card?',
|
||||||
@@ -50,6 +50,7 @@ export default {
|
|||||||
cardNotFound_title: 'Card non trovata',
|
cardNotFound_title: 'Card non trovata',
|
||||||
cardOrActionAreDeleted: "La card o l'azione vengono eliminate.",
|
cardOrActionAreDeleted: "La card o l'azione vengono eliminate.",
|
||||||
color: 'Colore',
|
color: 'Colore',
|
||||||
|
copy_inline: 'copia',
|
||||||
createBoard_title: 'Crea Bacheca',
|
createBoard_title: 'Crea Bacheca',
|
||||||
createLabel_title: 'Crea Etichetta',
|
createLabel_title: 'Crea Etichetta',
|
||||||
createNewOneOrSelectExistingOne: 'Crea nuovo o seleziona<br />esistente.',
|
createNewOneOrSelectExistingOne: 'Crea nuovo o seleziona<br />esistente.',
|
||||||
@@ -94,8 +95,10 @@ export default {
|
|||||||
filterByLabels_title: 'Filtra per Etichetta',
|
filterByLabels_title: 'Filtra per Etichetta',
|
||||||
filterByMembers_title: 'Filtra per Membro',
|
filterByMembers_title: 'Filtra per Membro',
|
||||||
fromComputer_title: 'Dal Computer',
|
fromComputer_title: 'Dal Computer',
|
||||||
|
fromTrello: 'Da Trello',
|
||||||
general: 'Generale',
|
general: 'Generale',
|
||||||
hours: 'Ore',
|
hours: 'Ore',
|
||||||
|
importBoard_title: 'Importa Board',
|
||||||
invalidCurrentPassword: 'Password corrente non valida',
|
invalidCurrentPassword: 'Password corrente non valida',
|
||||||
labels: 'Etichette',
|
labels: 'Etichette',
|
||||||
language: 'Lingua',
|
language: 'Lingua',
|
||||||
@@ -123,7 +126,7 @@ export default {
|
|||||||
phone: 'Telefono',
|
phone: 'Telefono',
|
||||||
preferences: 'Preferenze',
|
preferences: 'Preferenze',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: prmi Ctrl-V (Cmd-V on Mac) per aggiungere un allegato dalla clipboard.',
|
'Consiglio: premi Ctrl-V (Cmd-V on Mac) per aggiungere un allegato dalla clipboard.',
|
||||||
project: 'Progetto',
|
project: 'Progetto',
|
||||||
projectNotFound_title: 'Progetto non trovato',
|
projectNotFound_title: 'Progetto non trovato',
|
||||||
removeManager_title: 'Rimuovi Manager',
|
removeManager_title: 'Rimuovi Manager',
|
||||||
@@ -193,6 +196,8 @@ export default {
|
|||||||
deleteTask: 'Elimina task',
|
deleteTask: 'Elimina task',
|
||||||
deleteTask_title: 'Elimina Task',
|
deleteTask_title: 'Elimina Task',
|
||||||
deleteUser: 'Elimina utente',
|
deleteUser: 'Elimina utente',
|
||||||
|
duplicate: 'Duplica',
|
||||||
|
duplicateCard_title: 'Duplica Card',
|
||||||
edit: 'Modifica',
|
edit: 'Modifica',
|
||||||
editDueDate_title: 'Modifica data di scadenza',
|
editDueDate_title: 'Modifica data di scadenza',
|
||||||
editDescription_title: 'Modifica Descrizione',
|
editDescription_title: 'Modifica Descrizione',
|
||||||
@@ -204,9 +209,10 @@ export default {
|
|||||||
editTitle_title: 'Modifica Titolo',
|
editTitle_title: 'Modifica Titolo',
|
||||||
editUsername_title: 'Modifica Username',
|
editUsername_title: 'Modifica Username',
|
||||||
hideDetails: 'Nascondi dettagli',
|
hideDetails: 'Nascondi dettagli',
|
||||||
|
import: 'Importa',
|
||||||
leaveBoard: 'Lascia bacheca',
|
leaveBoard: 'Lascia bacheca',
|
||||||
leaveProject: 'Lascia progetto',
|
leaveProject: 'Lascia progetto',
|
||||||
logOut_title: 'Log Out',
|
logOut_title: 'Disconnettiti',
|
||||||
makeCover_title: 'Crea Cover',
|
makeCover_title: 'Crea Cover',
|
||||||
move: 'Muovi',
|
move: 'Muovi',
|
||||||
moveCard_title: 'Muovi Card',
|
moveCard_title: 'Muovi Card',
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ export default {
|
|||||||
list: 'Lista',
|
list: 'Lista',
|
||||||
listActions_title: 'Ações da Lista',
|
listActions_title: 'Ações da Lista',
|
||||||
managers: 'Gerentes',
|
managers: 'Gerentes',
|
||||||
|
memberInfo: 'Informações do Membro',
|
||||||
members: 'Membros',
|
members: 'Membros',
|
||||||
minutes: 'Minutos',
|
minutes: 'Minutos',
|
||||||
moveCard_title: 'Mover Cartão',
|
moveCard_title: 'Mover Cartão',
|
||||||
|
|||||||
@@ -199,6 +199,8 @@ export default {
|
|||||||
deleteProject: 'Удалить проект',
|
deleteProject: 'Удалить проект',
|
||||||
deleteTask: 'Удалить задачу',
|
deleteTask: 'Удалить задачу',
|
||||||
deleteUser: 'Удалить пользователя',
|
deleteUser: 'Удалить пользователя',
|
||||||
|
duplicate: 'Дублировать',
|
||||||
|
duplicateCard_title: 'Дублировать карточку',
|
||||||
edit: 'Изменить',
|
edit: 'Изменить',
|
||||||
editBackground: 'Изменить фон',
|
editBackground: 'Изменить фон',
|
||||||
editDueDate: 'Изменить срок',
|
editDueDate: 'Изменить срок',
|
||||||
|
|||||||
@@ -3,6 +3,9 @@ import { attr, fk, many } from 'redux-orm';
|
|||||||
import BaseModel from './BaseModel';
|
import BaseModel from './BaseModel';
|
||||||
import ActionTypes from '../constants/ActionTypes';
|
import ActionTypes from '../constants/ActionTypes';
|
||||||
|
|
||||||
|
import User from './User';
|
||||||
|
import Label from './Label';
|
||||||
|
|
||||||
export default class extends BaseModel {
|
export default class extends BaseModel {
|
||||||
static modelName = 'Board';
|
static modelName = 'Board';
|
||||||
|
|
||||||
@@ -25,6 +28,9 @@ export default class extends BaseModel {
|
|||||||
}),
|
}),
|
||||||
filterUsers: many('User', 'filterBoards'),
|
filterUsers: many('User', 'filterBoards'),
|
||||||
filterLabels: many('Label', 'filterBoards'),
|
filterLabels: many('Label', 'filterBoards'),
|
||||||
|
filterText: attr({
|
||||||
|
getDefault: () => '',
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
static reducer({ type, payload }, Board) {
|
static reducer({ type, payload }, Board) {
|
||||||
@@ -167,6 +173,47 @@ export default class extends BaseModel {
|
|||||||
Board.withId(payload.boardId).filterLabels.remove(payload.id);
|
Board.withId(payload.boardId).filterLabels.remove(payload.id);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
case ActionTypes.TEXT_FILTER_IN_CURRENT_BOARD: {
|
||||||
|
const board = Board.withId(payload.boardId);
|
||||||
|
let filterText = payload.text;
|
||||||
|
const posSpace = filterText.indexOf(' ');
|
||||||
|
|
||||||
|
// Shortcut to user filters
|
||||||
|
const posAT = filterText.indexOf('@');
|
||||||
|
if (posAT >= 0 && posSpace > 0 && posAT < posSpace) {
|
||||||
|
const userId = User.findUsersFromText(
|
||||||
|
filterText.substring(posAT + 1, posSpace),
|
||||||
|
board.memberships.toModelArray().map((membership) => membership.user),
|
||||||
|
);
|
||||||
|
if (
|
||||||
|
userId &&
|
||||||
|
board.filterUsers.toModelArray().filter((user) => user.id === userId).length === 0
|
||||||
|
) {
|
||||||
|
board.filterUsers.add(userId);
|
||||||
|
filterText = filterText.substring(0, posAT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shortcut to label filters
|
||||||
|
const posSharp = filterText.indexOf('#');
|
||||||
|
if (posSharp >= 0 && posSpace > 0 && posSharp < posSpace) {
|
||||||
|
const labelId = Label.findLabelsFromText(
|
||||||
|
filterText.substring(posSharp + 1, posSpace),
|
||||||
|
board.labels.toModelArray(),
|
||||||
|
);
|
||||||
|
if (
|
||||||
|
labelId &&
|
||||||
|
board.filterLabels.toModelArray().filter((label) => label.id === labelId).length === 0
|
||||||
|
) {
|
||||||
|
board.filterLabels.add(labelId);
|
||||||
|
filterText = filterText.substring(0, posSharp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
board.update({ filterText });
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,11 @@ export default class extends BaseModel {
|
|||||||
position: attr(),
|
position: attr(),
|
||||||
name: attr(),
|
name: attr(),
|
||||||
description: attr(),
|
description: attr(),
|
||||||
|
creatorUserId: oneToOne({
|
||||||
|
to: 'User',
|
||||||
|
as: 'creatorUser',
|
||||||
|
relatedName: 'ownCards',
|
||||||
|
}),
|
||||||
dueDate: attr(),
|
dueDate: attr(),
|
||||||
stopwatch: attr(),
|
stopwatch: attr(),
|
||||||
isSubscribed: attr({
|
isSubscribed: attr({
|
||||||
@@ -164,6 +169,14 @@ export default class extends BaseModel {
|
|||||||
Card.withId(payload.cardLabel.cardId).labels.remove(payload.cardLabel.labelId);
|
Card.withId(payload.cardLabel.cardId).labels.remove(payload.cardLabel.labelId);
|
||||||
} catch {} // eslint-disable-line no-empty
|
} catch {} // eslint-disable-line no-empty
|
||||||
|
|
||||||
|
break;
|
||||||
|
case ActionTypes.LIST_SORT__SUCCESS:
|
||||||
|
case ActionTypes.LIST_SORT_HANDLE:
|
||||||
|
case ActionTypes.NOTIFICATION_CREATE_HANDLE:
|
||||||
|
payload.cards.forEach((card) => {
|
||||||
|
Card.upsert(card);
|
||||||
|
});
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case ActionTypes.CARD_CREATE:
|
case ActionTypes.CARD_CREATE:
|
||||||
case ActionTypes.CARD_UPDATE__SUCCESS:
|
case ActionTypes.CARD_UPDATE__SUCCESS:
|
||||||
@@ -282,12 +295,6 @@ export default class extends BaseModel {
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ActionTypes.NOTIFICATION_CREATE_HANDLE:
|
|
||||||
payload.cards.forEach((card) => {
|
|
||||||
Card.upsert(card);
|
|
||||||
});
|
|
||||||
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,4 +80,16 @@ export default class extends BaseModel {
|
|||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static findLabelsFromText(filterText, labels) {
|
||||||
|
const selectLabel = filterText.toLocaleLowerCase();
|
||||||
|
const matchingLabels = labels.filter((label) =>
|
||||||
|
label.name ? label.name.toLocaleLowerCase().startsWith(selectLabel) : false,
|
||||||
|
);
|
||||||
|
if (matchingLabels.length === 1) {
|
||||||
|
// Appens the user to the filter
|
||||||
|
return matchingLabels[0].id;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { attr, fk } from 'redux-orm';
|
import { attr, fk } from 'redux-orm';
|
||||||
|
|
||||||
import BaseModel from './BaseModel';
|
import BaseModel from './BaseModel';
|
||||||
|
import User from './User';
|
||||||
import ActionTypes from '../constants/ActionTypes';
|
import ActionTypes from '../constants/ActionTypes';
|
||||||
|
|
||||||
export default class extends BaseModel {
|
export default class extends BaseModel {
|
||||||
@@ -50,6 +51,8 @@ export default class extends BaseModel {
|
|||||||
case ActionTypes.LIST_CREATE_HANDLE:
|
case ActionTypes.LIST_CREATE_HANDLE:
|
||||||
case ActionTypes.LIST_UPDATE__SUCCESS:
|
case ActionTypes.LIST_UPDATE__SUCCESS:
|
||||||
case ActionTypes.LIST_UPDATE_HANDLE:
|
case ActionTypes.LIST_UPDATE_HANDLE:
|
||||||
|
case ActionTypes.LIST_SORT__SUCCESS:
|
||||||
|
case ActionTypes.LIST_SORT_HANDLE:
|
||||||
List.upsert(payload.list);
|
List.upsert(payload.list);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -87,6 +90,37 @@ export default class extends BaseModel {
|
|||||||
getFilteredOrderedCardsModelArray() {
|
getFilteredOrderedCardsModelArray() {
|
||||||
let cardModels = this.getOrderedCardsQuerySet().toModelArray();
|
let cardModels = this.getOrderedCardsQuerySet().toModelArray();
|
||||||
|
|
||||||
|
const { filterText } = this.board;
|
||||||
|
|
||||||
|
if (filterText !== '') {
|
||||||
|
let re = null;
|
||||||
|
const posSpace = filterText.indexOf(' ');
|
||||||
|
|
||||||
|
if (filterText.startsWith('/')) {
|
||||||
|
re = new RegExp(filterText.substring(1), 'i');
|
||||||
|
}
|
||||||
|
let doRegularSearch = true;
|
||||||
|
if (re) {
|
||||||
|
cardModels = cardModels.filter((cardModel) => re.test(cardModel.name));
|
||||||
|
doRegularSearch = false;
|
||||||
|
} else if (filterText.startsWith('!') && posSpace > 0) {
|
||||||
|
const creatorUserId = User.findUsersFromText(
|
||||||
|
filterText.substring(1, posSpace),
|
||||||
|
this.board.memberships.toModelArray().map((membership) => membership.user),
|
||||||
|
);
|
||||||
|
if (creatorUserId != null) {
|
||||||
|
doRegularSearch = false;
|
||||||
|
cardModels = cardModels.filter((cardModel) => cardModel.creatorUser.id === creatorUserId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (doRegularSearch) {
|
||||||
|
const lowerCasedFilter = filterText.toLocaleLowerCase();
|
||||||
|
cardModels = cardModels.filter(
|
||||||
|
(cardModel) => cardModel.name.toLocaleLowerCase().indexOf(lowerCasedFilter) >= 0,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id);
|
const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id);
|
||||||
const filterLabelIds = this.board.filterLabels.toRefArray().map((label) => label.id);
|
const filterLabelIds = this.board.filterLabels.toRefArray().map((label) => label.id);
|
||||||
|
|
||||||
|
|||||||
@@ -359,4 +359,18 @@ export default class extends BaseModel {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static findUsersFromText(filterText, users) {
|
||||||
|
const selectUser = filterText.toLocaleLowerCase();
|
||||||
|
const matchingUsers = users.filter(
|
||||||
|
(user) =>
|
||||||
|
user.name.toLocaleLowerCase().startsWith(selectUser) ||
|
||||||
|
user.username.toLocaleLowerCase().startsWith(selectUser),
|
||||||
|
);
|
||||||
|
if (matchingUsers.length === 1) {
|
||||||
|
// Appens the user to the filter
|
||||||
|
return matchingUsers[0].id;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import { call, fork, join, put, select, take } from 'redux-saga/effects';
|
import { call, fork, join, put, select, take } from 'redux-saga/effects';
|
||||||
|
|
||||||
import selectors from '../../selectors';
|
import selectors from '../../selectors';
|
||||||
import actions from '../../actions';
|
import entryActions from '../../entry-actions';
|
||||||
import { removeAccessToken } from '../../utils/access-token-storage';
|
|
||||||
import ErrorCodes from '../../constants/ErrorCodes';
|
import ErrorCodes from '../../constants/ErrorCodes';
|
||||||
|
|
||||||
let lastRequestTask;
|
let lastRequestTask;
|
||||||
@@ -22,8 +21,7 @@ function* queueRequest(method, ...args) {
|
|||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error.code === ErrorCodes.UNAUTHORIZED) {
|
if (error.code === ErrorCodes.UNAUTHORIZED) {
|
||||||
yield call(removeAccessToken);
|
yield put(entryActions.logout(false));
|
||||||
yield put(actions.logout()); // TODO: next url
|
|
||||||
yield take();
|
yield take();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ export function* handleCardUpdate(card) {
|
|||||||
yield put(actions.handleCardUpdate(card));
|
yield put(actions.handleCardUpdate(card));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function* moveCard(id, listId, index) {
|
export function* moveCard(id, listId, index = 0) {
|
||||||
const position = yield select(selectors.selectNextCardPosition, listId, index, id);
|
const position = yield select(selectors.selectNextCardPosition, listId, index, id);
|
||||||
|
|
||||||
yield call(updateCard, id, {
|
yield call(updateCard, id, {
|
||||||
@@ -101,7 +101,7 @@ export function* moveCurrentCard(listId, index) {
|
|||||||
yield call(moveCard, cardId, listId, index);
|
yield call(moveCard, cardId, listId, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function* transferCard(id, boardId, listId, index) {
|
export function* transferCard(id, boardId, listId, index = 0) {
|
||||||
const { cardId: currentCardId, boardId: currentBoardId } = yield select(selectors.selectPath);
|
const { cardId: currentCardId, boardId: currentBoardId } = yield select(selectors.selectPath);
|
||||||
const position = yield select(selectors.selectNextCardPosition, listId, index, id);
|
const position = yield select(selectors.selectNextCardPosition, listId, index, id);
|
||||||
|
|
||||||
@@ -207,6 +207,12 @@ export function* handleCardDelete(card) {
|
|||||||
yield put(actions.handleCardDelete(card));
|
yield put(actions.handleCardDelete(card));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function* handleTextFilter(text) {
|
||||||
|
const { boardId } = yield select(selectors.selectPath);
|
||||||
|
|
||||||
|
yield put(actions.filterText(boardId, text));
|
||||||
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createCard,
|
createCard,
|
||||||
handleCardCreate,
|
handleCardCreate,
|
||||||
@@ -222,4 +228,5 @@ export default {
|
|||||||
deleteCard,
|
deleteCard,
|
||||||
deleteCurrentCard,
|
deleteCurrentCard,
|
||||||
handleCardDelete,
|
handleCardDelete,
|
||||||
|
handleTextFilter,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { call, put, select, take } from 'redux-saga/effects';
|
import { call, put, select } from 'redux-saga/effects';
|
||||||
|
|
||||||
import request from '../request';
|
import request from '../request';
|
||||||
import requests from '../requests';
|
import requests from '../requests';
|
||||||
@@ -84,8 +84,7 @@ export function* logout(invalidateAccessToken = true) {
|
|||||||
} catch (error) {} // eslint-disable-line no-empty
|
} catch (error) {} // eslint-disable-line no-empty
|
||||||
}
|
}
|
||||||
|
|
||||||
yield put(actions.logout());
|
yield put(actions.logout()); // TODO: next url
|
||||||
yield take();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -70,6 +70,30 @@ export function* moveList(id, index) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: sort locally
|
||||||
|
export function* sortList(id, data) {
|
||||||
|
yield put(actions.sortList(id, data));
|
||||||
|
|
||||||
|
let list;
|
||||||
|
let cards;
|
||||||
|
|
||||||
|
try {
|
||||||
|
({
|
||||||
|
item: list,
|
||||||
|
included: { cards },
|
||||||
|
} = yield call(request, api.sortList, id, data));
|
||||||
|
} catch (error) {
|
||||||
|
yield put(actions.sortList.failure(id, error));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
yield put(actions.sortList.success(list, cards));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function* handleListSort(list, cards) {
|
||||||
|
yield put(actions.handleListSort(list, cards));
|
||||||
|
}
|
||||||
|
|
||||||
export function* deleteList(id) {
|
export function* deleteList(id) {
|
||||||
yield put(actions.deleteList(id));
|
yield put(actions.deleteList(id));
|
||||||
|
|
||||||
@@ -95,6 +119,8 @@ export default {
|
|||||||
updateList,
|
updateList,
|
||||||
handleListUpdate,
|
handleListUpdate,
|
||||||
moveList,
|
moveList,
|
||||||
|
sortList,
|
||||||
|
handleListSort,
|
||||||
deleteList,
|
deleteList,
|
||||||
handleListDelete,
|
handleListDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import { call, put, select, take } from 'redux-saga/effects';
|
import { call, put, select, take } from 'redux-saga/effects';
|
||||||
import { push } from '../../../lib/redux-router';
|
import { push } from '../../../lib/redux-router';
|
||||||
|
|
||||||
|
import { logout } from './core';
|
||||||
import request from '../request';
|
import request from '../request';
|
||||||
import selectors from '../../../selectors';
|
import selectors from '../../../selectors';
|
||||||
import actions from '../../../actions';
|
import actions from '../../../actions';
|
||||||
import api from '../../../api';
|
import api from '../../../api';
|
||||||
|
import { getAccessToken } from '../../../utils/access-token-storage';
|
||||||
import ActionTypes from '../../../constants/ActionTypes';
|
import ActionTypes from '../../../constants/ActionTypes';
|
||||||
import Paths from '../../../constants/Paths';
|
import Paths from '../../../constants/Paths';
|
||||||
|
|
||||||
@@ -25,6 +27,13 @@ export function* goToCard(cardId) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function* handleLocationChange() {
|
export function* handleLocationChange() {
|
||||||
|
const accessToken = yield call(getAccessToken);
|
||||||
|
|
||||||
|
if (!accessToken) {
|
||||||
|
yield call(logout, false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const pathsMatch = yield select(selectors.selectPathsMatch);
|
const pathsMatch = yield select(selectors.selectPathsMatch);
|
||||||
|
|
||||||
if (!pathsMatch) {
|
if (!pathsMatch) {
|
||||||
|
|||||||
@@ -218,6 +218,7 @@ export function* handleUserDelete(user) {
|
|||||||
|
|
||||||
if (user.id === currentUserId) {
|
if (user.id === currentUserId) {
|
||||||
yield call(logout, false);
|
yield call(logout, false);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
yield put(actions.handleUserDelete(user));
|
yield put(actions.handleUserDelete(user));
|
||||||
|
|||||||
@@ -39,5 +39,8 @@ export default function* cardsWatchers() {
|
|||||||
takeEvery(EntryActionTypes.CARD_DELETE_HANDLE, ({ payload: { card } }) =>
|
takeEvery(EntryActionTypes.CARD_DELETE_HANDLE, ({ payload: { card } }) =>
|
||||||
services.handleCardDelete(card),
|
services.handleCardDelete(card),
|
||||||
),
|
),
|
||||||
|
takeEvery(EntryActionTypes.TEXT_FILTER_IN_CURRENT_BOARD, ({ payload: { text } }) =>
|
||||||
|
services.handleTextFilter(text),
|
||||||
|
),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,5 +4,9 @@ import services from '../services';
|
|||||||
import EntryActionTypes from '../../../constants/EntryActionTypes';
|
import EntryActionTypes from '../../../constants/EntryActionTypes';
|
||||||
|
|
||||||
export default function* coreWatchers() {
|
export default function* coreWatchers() {
|
||||||
yield all([takeEvery(EntryActionTypes.LOGOUT, () => services.logout())]);
|
yield all([
|
||||||
|
takeEvery(EntryActionTypes.LOGOUT, ({ payload: { invalidateAccessToken } }) =>
|
||||||
|
services.logout(invalidateAccessToken),
|
||||||
|
),
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,12 @@ export default function* listsWatchers() {
|
|||||||
takeEvery(EntryActionTypes.LIST_MOVE, ({ payload: { id, index } }) =>
|
takeEvery(EntryActionTypes.LIST_MOVE, ({ payload: { id, index } }) =>
|
||||||
services.moveList(id, index),
|
services.moveList(id, index),
|
||||||
),
|
),
|
||||||
|
takeEvery(EntryActionTypes.LIST_SORT, ({ payload: { id, data } }) =>
|
||||||
|
services.sortList(id, data),
|
||||||
|
),
|
||||||
|
takeEvery(EntryActionTypes.LIST_SORT_HANDLE, ({ payload: { list, cards } }) =>
|
||||||
|
services.handleListSort(list, cards),
|
||||||
|
),
|
||||||
takeEvery(EntryActionTypes.LIST_DELETE, ({ payload: { id } }) => services.deleteList(id)),
|
takeEvery(EntryActionTypes.LIST_DELETE, ({ payload: { id } }) => services.deleteList(id)),
|
||||||
takeEvery(EntryActionTypes.LIST_DELETE_HANDLE, ({ payload: { list } }) =>
|
takeEvery(EntryActionTypes.LIST_DELETE_HANDLE, ({ payload: { list } }) =>
|
||||||
services.handleListDelete(list),
|
services.handleListDelete(list),
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ const createSocketEventsChannel = () =>
|
|||||||
emit(entryActions.handleSocketReconnect());
|
emit(entryActions.handleSocketReconnect());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleLogout = () => {
|
||||||
|
emit(entryActions.logout(false));
|
||||||
|
};
|
||||||
|
|
||||||
const handleUserCreate = api.makeHandleUserCreate(({ item }) => {
|
const handleUserCreate = api.makeHandleUserCreate(({ item }) => {
|
||||||
emit(entryActions.handleUserCreate(item));
|
emit(entryActions.handleUserCreate(item));
|
||||||
});
|
});
|
||||||
@@ -80,6 +84,10 @@ const createSocketEventsChannel = () =>
|
|||||||
emit(entryActions.handleListUpdate(item));
|
emit(entryActions.handleListUpdate(item));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleListSort = api.makeHandleListSort(({ item, included: { cards } }) => {
|
||||||
|
emit(entryActions.handleListSort(item, cards));
|
||||||
|
});
|
||||||
|
|
||||||
const handleListDelete = ({ item }) => {
|
const handleListDelete = ({ item }) => {
|
||||||
emit(entryActions.handleListDelete(item));
|
emit(entryActions.handleListDelete(item));
|
||||||
};
|
};
|
||||||
@@ -171,6 +179,8 @@ const createSocketEventsChannel = () =>
|
|||||||
socket.on('disconnect', handleDisconnect);
|
socket.on('disconnect', handleDisconnect);
|
||||||
socket.on('reconnect', handleReconnect);
|
socket.on('reconnect', handleReconnect);
|
||||||
|
|
||||||
|
socket.on('logout', handleLogout);
|
||||||
|
|
||||||
socket.on('userCreate', handleUserCreate);
|
socket.on('userCreate', handleUserCreate);
|
||||||
socket.on('userUpdate', handleUserUpdate);
|
socket.on('userUpdate', handleUserUpdate);
|
||||||
socket.on('userDelete', handleUserDelete);
|
socket.on('userDelete', handleUserDelete);
|
||||||
@@ -192,6 +202,7 @@ const createSocketEventsChannel = () =>
|
|||||||
|
|
||||||
socket.on('listCreate', handleListCreate);
|
socket.on('listCreate', handleListCreate);
|
||||||
socket.on('listUpdate', handleListUpdate);
|
socket.on('listUpdate', handleListUpdate);
|
||||||
|
socket.on('listSort', handleListSort);
|
||||||
socket.on('listDelete', handleListDelete);
|
socket.on('listDelete', handleListDelete);
|
||||||
|
|
||||||
socket.on('labelCreate', handleLabelCreate);
|
socket.on('labelCreate', handleLabelCreate);
|
||||||
@@ -227,6 +238,8 @@ const createSocketEventsChannel = () =>
|
|||||||
socket.off('disconnect', handleDisconnect);
|
socket.off('disconnect', handleDisconnect);
|
||||||
socket.off('reconnect', handleReconnect);
|
socket.off('reconnect', handleReconnect);
|
||||||
|
|
||||||
|
socket.off('logout', handleLogout);
|
||||||
|
|
||||||
socket.off('userCreate', handleUserCreate);
|
socket.off('userCreate', handleUserCreate);
|
||||||
socket.off('userUpdate', handleUserUpdate);
|
socket.off('userUpdate', handleUserUpdate);
|
||||||
socket.off('userDelete', handleUserDelete);
|
socket.off('userDelete', handleUserDelete);
|
||||||
@@ -248,6 +261,7 @@ const createSocketEventsChannel = () =>
|
|||||||
|
|
||||||
socket.off('listCreate', handleListCreate);
|
socket.off('listCreate', handleListCreate);
|
||||||
socket.off('listUpdate', handleListUpdate);
|
socket.off('listUpdate', handleListUpdate);
|
||||||
|
socket.off('listSort', handleListSort);
|
||||||
socket.off('listDelete', handleListDelete);
|
socket.off('listDelete', handleListDelete);
|
||||||
|
|
||||||
socket.off('labelCreate', handleLabelCreate);
|
socket.off('labelCreate', handleLabelCreate);
|
||||||
|
|||||||
@@ -175,6 +175,24 @@ export const selectFilterLabelsForCurrentBoard = createSelector(
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
export const selectFilterTextForCurrentBoard = createSelector(
|
||||||
|
orm,
|
||||||
|
(state) => selectPath(state).boardId,
|
||||||
|
({ Board }, id) => {
|
||||||
|
if (!id) {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
const boardModel = Board.withId(id);
|
||||||
|
|
||||||
|
if (!boardModel) {
|
||||||
|
return boardModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
return boardModel.filterText;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
export const selectIsBoardWithIdExists = createSelector(
|
export const selectIsBoardWithIdExists = createSelector(
|
||||||
orm,
|
orm,
|
||||||
(_, id) => id,
|
(_, id) => id,
|
||||||
@@ -191,5 +209,6 @@ export default {
|
|||||||
selectListIdsForCurrentBoard,
|
selectListIdsForCurrentBoard,
|
||||||
selectFilterUsersForCurrentBoard,
|
selectFilterUsersForCurrentBoard,
|
||||||
selectFilterLabelsForCurrentBoard,
|
selectFilterLabelsForCurrentBoard,
|
||||||
|
selectFilterTextForCurrentBoard,
|
||||||
selectIsBoardWithIdExists,
|
selectIsBoardWithIdExists,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
FROM node:18-alpine as server-dependencies
|
||||||
|
|
||||||
|
RUN apk -U upgrade \
|
||||||
|
&& apk add build-base python3 \
|
||||||
|
--no-cache
|
||||||
|
|
||||||
|
WORKDIR /app/client
|
||||||
|
COPY package.json package-lock.json /app/client/
|
||||||
|
RUN npm install npm@latest --global \
|
||||||
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
|
&& pnpm install
|
||||||
|
|
||||||
|
|
||||||
|
WORKDIR /app/
|
||||||
|
COPY ../../package.json ../../package-lock.json /app/
|
||||||
|
RUN pnpm import \
|
||||||
|
&& pnpm install
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
FROM node:18-alpine as server-dependencies
|
||||||
|
|
||||||
|
RUN apk -U upgrade \
|
||||||
|
&& apk add build-base python3 \
|
||||||
|
--no-cache
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY package.json package-lock.json ./
|
||||||
|
|
||||||
|
RUN npm install npm@latest --global \
|
||||||
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
|
&& pnpm install
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
user nginx;
|
||||||
|
worker_processes 1;
|
||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
include /etc/nginx/mime.types;
|
||||||
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
sendfile on;
|
||||||
|
keepalive_timeout 65;
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://server:1337;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection 'upgrade';
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_cache_bypass $http_upgrade;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /socket.io {
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "upgrade";
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_pass http://server:1337/socket.io;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://client:3000;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection 'upgrade';
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_cache_bypass $http_upgrade;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+80
-35
@@ -1,20 +1,18 @@
|
|||||||
version: '3'
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
planka:
|
|
||||||
image: ghcr.io/plankanban/planka:master
|
|
||||||
restart: on-failure
|
|
||||||
volumes:
|
|
||||||
- user-avatars:/app/public/user-avatars
|
|
||||||
- project-background-images:/app/public/project-background-images
|
|
||||||
- attachments:/app/private/attachments
|
|
||||||
ports:
|
|
||||||
- 3000:1337
|
|
||||||
environment:
|
|
||||||
- BASE_URL=http://localhost:3000
|
|
||||||
- DATABASE_URL=postgresql://postgres@postgres/planka
|
|
||||||
- SECRET_KEY=notsecretkey
|
|
||||||
|
|
||||||
|
server:
|
||||||
|
build:
|
||||||
|
context: ./server
|
||||||
|
dockerfile: ../config/development/Dockerfile.server
|
||||||
|
volumes:
|
||||||
|
- ./server:/app
|
||||||
|
- /app/node_modules
|
||||||
|
environment:
|
||||||
|
- NODE_ENV=development
|
||||||
|
- DATABASE_URL=postgresql://user:password@postgres:5432/planka_db
|
||||||
|
- SECRET_KEY=notsecretkey
|
||||||
# - TRUST_PROXY=0
|
# - TRUST_PROXY=0
|
||||||
# - TOKEN_EXPIRES_IN=365 # In days
|
# - TOKEN_EXPIRES_IN=365 # In days
|
||||||
|
|
||||||
@@ -25,20 +23,6 @@ services:
|
|||||||
|
|
||||||
# Configure knex to accept SSL certificates
|
# Configure knex to accept SSL certificates
|
||||||
# - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
|
# - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
|
||||||
|
|
||||||
# - DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted
|
|
||||||
# - DEFAULT_ADMIN_PASSWORD=demo
|
|
||||||
# - DEFAULT_ADMIN_NAME=Demo Demo
|
|
||||||
# - DEFAULT_ADMIN_USERNAME=demo
|
|
||||||
|
|
||||||
# Email Notifications (https://nodemailer.com/smtp/)
|
|
||||||
# - SMTP_HOST=
|
|
||||||
# - SMTP_PORT=587
|
|
||||||
# - SMTP_SECURE=true
|
|
||||||
# - SMTP_USER=
|
|
||||||
# - SMTP_PASSWORD=
|
|
||||||
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
|
||||||
|
|
||||||
# - OIDC_ISSUER=
|
# - OIDC_ISSUER=
|
||||||
# - OIDC_CLIENT_ID=
|
# - OIDC_CLIENT_ID=
|
||||||
# - OIDC_CLIENT_SECRET=
|
# - OIDC_CLIENT_SECRET=
|
||||||
@@ -51,26 +35,87 @@ services:
|
|||||||
# - OIDC_IGNORE_USERNAME=true
|
# - OIDC_IGNORE_USERNAME=true
|
||||||
# - OIDC_IGNORE_ROLES=true
|
# - OIDC_IGNORE_ROLES=true
|
||||||
# - OIDC_ENFORCED=true
|
# - OIDC_ENFORCED=true
|
||||||
|
|
||||||
|
# Email Notifications (https://nodemailer.com/smtp/)
|
||||||
|
# - SMTP_HOST=
|
||||||
|
# - SMTP_PORT=587
|
||||||
|
# - SMTP_SECURE=true
|
||||||
|
# - SMTP_USER=
|
||||||
|
# - SMTP_PASSWORD=
|
||||||
|
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
||||||
|
|
||||||
|
# - SLACK_BOT_TOKEN=
|
||||||
|
# - SLACK_CHANNEL_ID=
|
||||||
|
|
||||||
|
working_dir: /app
|
||||||
|
command: ["sh", "-c", "npm run start"]
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
|
client:
|
||||||
|
build:
|
||||||
|
context: ./client
|
||||||
|
dockerfile: ../config/development/Dockerfile.client
|
||||||
|
volumes:
|
||||||
|
- ./client:/app/client
|
||||||
|
- /app/client/node_modules
|
||||||
|
- /app/node_modules
|
||||||
|
environment:
|
||||||
|
- NODE_ENV=development
|
||||||
|
- CHOKIDAR_USEPOLLING=true
|
||||||
|
- BASE_URL=http://localhost:3000
|
||||||
|
- REACT_APP_SERVER_BASE_URL=http://localhost:3000
|
||||||
|
working_dir: /app/client
|
||||||
|
command: npm start
|
||||||
|
|
||||||
|
init-db:
|
||||||
|
build:
|
||||||
|
context: ./server
|
||||||
|
dockerfile: ../config/development/Dockerfile.server
|
||||||
|
environment:
|
||||||
|
- DATABASE_URL=postgresql://user:password@postgres:5432/planka_db
|
||||||
|
# - DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted
|
||||||
|
# - DEFAULT_ADMIN_PASSWORD=demo
|
||||||
|
# - DEFAULT_ADMIN_NAME=Demo Demo
|
||||||
|
# - DEFAULT_ADMIN_USERNAME=demo
|
||||||
|
|
||||||
|
working_dir: /app
|
||||||
|
command: ["sh", "-c", "npm run db:init"]
|
||||||
|
volumes:
|
||||||
|
- ./server:/app
|
||||||
|
- /app/node_modules
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:14-alpine
|
image: postgres:latest
|
||||||
restart: on-failure
|
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/var/lib/postgresql/data
|
- db-data:/var/lib/postgresql/data
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_DB=planka
|
POSTGRES_DB: planka_db
|
||||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
POSTGRES_USER: user
|
||||||
|
POSTGRES_PASSWORD: password
|
||||||
|
ports:
|
||||||
|
- "5432:5432"
|
||||||
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U postgres -d planka"]
|
test: ["CMD-SHELL", "pg_isready -U postgres -d planka"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
|
||||||
|
proxy:
|
||||||
|
image: nginx:alpine
|
||||||
|
ports:
|
||||||
|
- "3000:80"
|
||||||
|
volumes:
|
||||||
|
- ./config/development/nginx.conf:/etc/nginx/nginx.conf
|
||||||
|
depends_on:
|
||||||
|
- server
|
||||||
|
- client
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
user-avatars:
|
|
||||||
project-background-images:
|
|
||||||
attachments:
|
|
||||||
db-data:
|
db-data:
|
||||||
|
|||||||
+11
-8
@@ -31,14 +31,6 @@ services:
|
|||||||
# - DEFAULT_ADMIN_NAME=Demo Demo
|
# - DEFAULT_ADMIN_NAME=Demo Demo
|
||||||
# - DEFAULT_ADMIN_USERNAME=demo
|
# - DEFAULT_ADMIN_USERNAME=demo
|
||||||
|
|
||||||
# Email Notifications (https://nodemailer.com/smtp/)
|
|
||||||
# - SMTP_HOST=
|
|
||||||
# - SMTP_PORT=587
|
|
||||||
# - SMTP_SECURE=true
|
|
||||||
# - SMTP_USER=
|
|
||||||
# - SMTP_PASSWORD=
|
|
||||||
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
|
||||||
|
|
||||||
# - OIDC_ISSUER=
|
# - OIDC_ISSUER=
|
||||||
# - OIDC_CLIENT_ID=
|
# - OIDC_CLIENT_ID=
|
||||||
# - OIDC_CLIENT_SECRET=
|
# - OIDC_CLIENT_SECRET=
|
||||||
@@ -51,6 +43,17 @@ services:
|
|||||||
# - OIDC_IGNORE_USERNAME=true
|
# - OIDC_IGNORE_USERNAME=true
|
||||||
# - OIDC_IGNORE_ROLES=true
|
# - OIDC_IGNORE_ROLES=true
|
||||||
# - OIDC_ENFORCED=true
|
# - OIDC_ENFORCED=true
|
||||||
|
|
||||||
|
# Email Notifications (https://nodemailer.com/smtp/)
|
||||||
|
# - SMTP_HOST=
|
||||||
|
# - SMTP_PORT=587
|
||||||
|
# - SMTP_SECURE=true
|
||||||
|
# - SMTP_USER=
|
||||||
|
# - SMTP_PASSWORD=
|
||||||
|
# - SMTP_FROM="Demo Demo" <demo@demo.demo>
|
||||||
|
|
||||||
|
# - SLACK_BOT_TOKEN=
|
||||||
|
# - SLACK_CHANNEL_ID=
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.16.2",
|
"version": "1.17.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.16.2",
|
"version": "1.17.0",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.16.2",
|
"version": "1.17.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": "https://plankanban.github.io/planka",
|
"homepage": "https://plankanban.github.io/planka",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
+11
-8
@@ -22,14 +22,6 @@ SECRET_KEY=notsecretkey
|
|||||||
# DEFAULT_ADMIN_NAME=Demo Demo
|
# DEFAULT_ADMIN_NAME=Demo Demo
|
||||||
# DEFAULT_ADMIN_USERNAME=demo
|
# DEFAULT_ADMIN_USERNAME=demo
|
||||||
|
|
||||||
# Email Notifications (https://nodemailer.com/smtp/)
|
|
||||||
# SMTP_HOST=
|
|
||||||
# SMTP_PORT=587
|
|
||||||
# SMTP_SECURE=true
|
|
||||||
# SMTP_USER=
|
|
||||||
# SMTP_PASSWORD=
|
|
||||||
# SMTP_FROM="Demo Demo" <demo@demo.demo>
|
|
||||||
|
|
||||||
# OIDC_ISSUER=
|
# OIDC_ISSUER=
|
||||||
# OIDC_CLIENT_ID=
|
# OIDC_CLIENT_ID=
|
||||||
# OIDC_CLIENT_SECRET=
|
# OIDC_CLIENT_SECRET=
|
||||||
@@ -43,6 +35,17 @@ SECRET_KEY=notsecretkey
|
|||||||
# OIDC_IGNORE_ROLES=true
|
# OIDC_IGNORE_ROLES=true
|
||||||
# OIDC_ENFORCED=true
|
# OIDC_ENFORCED=true
|
||||||
|
|
||||||
|
# Email Notifications (https://nodemailer.com/smtp/)
|
||||||
|
# SMTP_HOST=
|
||||||
|
# SMTP_PORT=587
|
||||||
|
# SMTP_SECURE=true
|
||||||
|
# SMTP_USER=
|
||||||
|
# SMTP_PASSWORD=
|
||||||
|
# SMTP_FROM="Demo Demo" <demo@demo.demo>
|
||||||
|
|
||||||
|
# SLACK_BOT_TOKEN=
|
||||||
|
# SLACK_CHANNEL_ID=
|
||||||
|
|
||||||
## Do not edit this
|
## Do not edit this
|
||||||
|
|
||||||
TZ=UTC
|
TZ=UTC
|
||||||
|
|||||||
@@ -9,6 +9,10 @@ module.exports = {
|
|||||||
deletedAt: new Date().toISOString(),
|
deletedAt: new Date().toISOString(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (this.req.isSocket) {
|
||||||
|
sails.sockets.leaveAll(`@accessToken:${accessToken}`);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
item: accessToken,
|
item: accessToken,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ module.exports = {
|
|||||||
|
|
||||||
card = await sails.helpers.cards.deleteOne.with({
|
card = await sails.helpers.cards.deleteOne.with({
|
||||||
record: card,
|
record: card,
|
||||||
|
user: currentUser,
|
||||||
request: this.req,
|
request: this.req,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
|
LIST_NOT_FOUND: {
|
||||||
|
listNotFound: 'List not found',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
inputs: {
|
||||||
|
id: {
|
||||||
|
type: 'string',
|
||||||
|
regex: /^[0-9]+$/,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
type: {
|
||||||
|
type: 'string',
|
||||||
|
isIn: Object.values(List.SortTypes),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
|
listNotFound: {
|
||||||
|
responseType: 'notFound',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fn(inputs) {
|
||||||
|
const { currentUser } = this.req;
|
||||||
|
|
||||||
|
const { list } = await sails.helpers.lists
|
||||||
|
.getProjectPath(inputs.id)
|
||||||
|
.intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
|
||||||
|
|
||||||
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: list.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!boardMembership) {
|
||||||
|
throw Errors.LIST_NOT_FOUND;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cards = await sails.helpers.lists.sortOne.with({
|
||||||
|
record: list,
|
||||||
|
type: inputs.type,
|
||||||
|
request: this.req,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
item: list,
|
||||||
|
included: {
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -14,6 +14,30 @@ const valuesValidator = (value) => {
|
|||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const buildAndSendSlackMessage = async (user, card, action) => {
|
||||||
|
const cardLink = `<${sails.config.custom.baseUrl}/cards/${card.id}|${card.name}>`;
|
||||||
|
|
||||||
|
let markdown;
|
||||||
|
switch (action.type) {
|
||||||
|
case Action.Types.CREATE_CARD:
|
||||||
|
markdown = `${cardLink} was created by ${user.name} in *${action.data.list.name}*`;
|
||||||
|
|
||||||
|
break;
|
||||||
|
case Action.Types.MOVE_CARD:
|
||||||
|
markdown = `${cardLink} was moved by ${user.name} to *${action.data.toList.name}*`;
|
||||||
|
|
||||||
|
break;
|
||||||
|
case Action.Types.COMMENT_CARD:
|
||||||
|
markdown = `*${user.name}* commented on ${cardLink}:\n>${action.data.text}`;
|
||||||
|
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await sails.helpers.utils.sendSlackMessage(markdown);
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
inputs: {
|
inputs: {
|
||||||
values: {
|
values: {
|
||||||
@@ -67,6 +91,10 @@ module.exports = {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (sails.config.custom.slackBotToken) {
|
||||||
|
buildAndSendSlackMessage(values.user, values.card, action);
|
||||||
|
}
|
||||||
|
|
||||||
return action;
|
return action;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,9 +1,17 @@
|
|||||||
|
const buildAndSendSlackMessage = async (user, card) => {
|
||||||
|
await sails.helpers.utils.sendSlackMessage(`*${card.name}* was deleted by ${user.name}`);
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
inputs: {
|
inputs: {
|
||||||
record: {
|
record: {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
user: {
|
||||||
|
type: 'ref',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
request: {
|
request: {
|
||||||
type: 'ref',
|
type: 'ref',
|
||||||
},
|
},
|
||||||
@@ -21,6 +29,10 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
inputs.request,
|
inputs.request,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (sails.config.custom.slackBotToken) {
|
||||||
|
buildAndSendSlackMessage(inputs.user, card);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return card;
|
return card;
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
const List = require('../../models/List');
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
inputs: {
|
||||||
|
record: {
|
||||||
|
type: 'ref',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
type: {
|
||||||
|
type: 'string',
|
||||||
|
isIn: Object.values(List.SortTypes),
|
||||||
|
defaultsTo: List.SortTypes.NAME_ASC,
|
||||||
|
},
|
||||||
|
request: {
|
||||||
|
type: 'ref',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fn(inputs) {
|
||||||
|
let cards = await sails.helpers.lists.getCards(inputs.record.id);
|
||||||
|
|
||||||
|
switch (inputs.type) {
|
||||||
|
case List.SortTypes.NAME_ASC:
|
||||||
|
cards.sort((a, b) => a.name.localeCompare(b.name));
|
||||||
|
break;
|
||||||
|
case List.SortTypes.DUE_DATE_ASC:
|
||||||
|
cards.sort((a, b) => {
|
||||||
|
if (a.dueDate === null) return 1;
|
||||||
|
if (b.dueDate === null) return -1;
|
||||||
|
return new Date(a.dueDate) - new Date(b.dueDate);
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case List.SortTypes.CREATED_AT_ASC:
|
||||||
|
cards.sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
|
||||||
|
break;
|
||||||
|
case List.SortTypes.CREATED_AT_DESC:
|
||||||
|
cards.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new Error('Invalid sort type specified');
|
||||||
|
}
|
||||||
|
|
||||||
|
const positions = cards.map((c) => c.position).sort((a, b) => a - b);
|
||||||
|
|
||||||
|
cards = await Promise.all(
|
||||||
|
cards.map(({ id }, index) =>
|
||||||
|
Card.updateOne({
|
||||||
|
id,
|
||||||
|
listId: inputs.record.id,
|
||||||
|
}).set({
|
||||||
|
position: positions[index],
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
sails.sockets.broadcast(
|
||||||
|
`board:${inputs.record.boardId}`,
|
||||||
|
'listSort',
|
||||||
|
{
|
||||||
|
item: inputs.record,
|
||||||
|
included: {
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
inputs.request,
|
||||||
|
);
|
||||||
|
|
||||||
|
return cards;
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -27,6 +27,7 @@ const buildAndSendEmail = async (user, board, card, action, notifiableUser) => {
|
|||||||
`from ${action.data.fromList.name} to ${action.data.toList.name} ` +
|
`from ${action.data.fromList.name} to ${action.data.toList.name} ` +
|
||||||
`on <a href="${process.env.BASE_URL}/boards/${board.id}">${board.name}</a></p>`,
|
`on <a href="${process.env.BASE_URL}/boards/${board.id}">${board.name}</a></p>`,
|
||||||
};
|
};
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case Action.Types.COMMENT_CARD:
|
case Action.Types.COMMENT_CARD:
|
||||||
emailData = {
|
emailData = {
|
||||||
@@ -37,6 +38,7 @@ const buildAndSendEmail = async (user, board, card, action, notifiableUser) => {
|
|||||||
`on <a href="${process.env.BASE_URL}/boards/${board.id}">${board.name}</a></p>` +
|
`on <a href="${process.env.BASE_URL}/boards/${board.id}">${board.name}</a></p>` +
|
||||||
`<p>${action.data.text}</p>`,
|
`<p>${action.data.text}</p>`,
|
||||||
};
|
};
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -23,9 +23,9 @@ module.exports = {
|
|||||||
from: sails.config.custom.smtpFrom,
|
from: sails.config.custom.smtpFrom,
|
||||||
});
|
});
|
||||||
|
|
||||||
sails.log.info('Email sent: %s', info.messageId);
|
sails.log.info(`Email sent: ${info.messageId}`);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
sails.log.error(error);
|
sails.log.error(`Error sending email: ${error}`);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
const POST_MESSAGE_API_URL = 'https://slack.com/api/chat.postMessage';
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
inputs: {
|
||||||
|
markdown: {
|
||||||
|
type: 'string',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fn(inputs) {
|
||||||
|
const headers = {
|
||||||
|
Authorization: `Bearer ${sails.config.custom.slackBotToken}`,
|
||||||
|
'Content-Type': 'application/json; charset=utf-8',
|
||||||
|
};
|
||||||
|
|
||||||
|
const body = {
|
||||||
|
blocks: [
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
text: {
|
||||||
|
type: 'mrkdwn',
|
||||||
|
text: inputs.markdown,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
channel: sails.config.custom.slackChannelId,
|
||||||
|
};
|
||||||
|
|
||||||
|
let response;
|
||||||
|
try {
|
||||||
|
response = await fetch(POST_MESSAGE_API_URL, {
|
||||||
|
headers,
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
sails.log.error(`Error sending to Slack: ${error}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
sails.log.error(`Error sending to Slack: ${response.error}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const responseJson = await response.json();
|
||||||
|
|
||||||
|
if (!responseJson.ok) {
|
||||||
|
sails.log.error(`Error sending to Slack: ${responseJson.error}`);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -61,6 +61,7 @@ module.exports = function defineCurrentUserHook(sails) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (req.isSocket) {
|
if (req.isSocket) {
|
||||||
|
sails.sockets.join(req, `@accessToken:${accessToken}`);
|
||||||
sails.sockets.join(req, `@user:${currentUser.id}`);
|
sails.sockets.join(req, `@user:${currentUser.id}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,14 @@
|
|||||||
const openidClient = require('openid-client');
|
const openidClient = require('openid-client');
|
||||||
|
|
||||||
module.exports = function oidcServiceHook(sails) {
|
/**
|
||||||
|
* oidc hook
|
||||||
|
*
|
||||||
|
* @description :: A hook definition. Extends Sails by adding shadow routes, implicit actions,
|
||||||
|
* and/or initialization logic.
|
||||||
|
* @docs :: https://sailsjs.com/docs/concepts/extending-sails/hooks
|
||||||
|
*/
|
||||||
|
|
||||||
|
module.exports = function defineOidcHook(sails) {
|
||||||
let client = null;
|
let client = null;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -9,17 +17,20 @@ module.exports = function oidcServiceHook(sails) {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
async initialize() {
|
async initialize() {
|
||||||
if (sails.config.custom.oidcIssuer) {
|
if (!sails.config.custom.oidcIssuer) {
|
||||||
const issuer = await openidClient.Issuer.discover(sails.config.custom.oidcIssuer);
|
return;
|
||||||
|
|
||||||
client = new issuer.Client({
|
|
||||||
client_id: sails.config.custom.oidcClientId,
|
|
||||||
client_secret: sails.config.custom.oidcClientSecret,
|
|
||||||
redirect_uris: [sails.config.custom.oidcRedirectUri],
|
|
||||||
response_types: ['code'],
|
|
||||||
});
|
|
||||||
sails.log.info('OIDC hook has been loaded successfully');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sails.log.info('Initializing custom hook (`oidc`)');
|
||||||
|
|
||||||
|
const issuer = await openidClient.Issuer.discover(sails.config.custom.oidcIssuer);
|
||||||
|
|
||||||
|
client = new issuer.Client({
|
||||||
|
client_id: sails.config.custom.oidcClientId,
|
||||||
|
client_secret: sails.config.custom.oidcClientSecret,
|
||||||
|
redirect_uris: [sails.config.custom.oidcRedirectUri],
|
||||||
|
response_types: ['code'],
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
getClient() {
|
getClient() {
|
||||||
|
|||||||
@@ -1,6 +1,14 @@
|
|||||||
const nodemailer = require('nodemailer');
|
const nodemailer = require('nodemailer');
|
||||||
|
|
||||||
module.exports = function smtpServiceHook(sails) {
|
/**
|
||||||
|
* smtp hook
|
||||||
|
*
|
||||||
|
* @description :: A hook definition. Extends Sails by adding shadow routes, implicit actions,
|
||||||
|
* and/or initialization logic.
|
||||||
|
* @docs :: https://sailsjs.com/docs/concepts/extending-sails/hooks
|
||||||
|
*/
|
||||||
|
|
||||||
|
module.exports = function defineSmtpHook(sails) {
|
||||||
let transporter = null;
|
let transporter = null;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -9,19 +17,22 @@ module.exports = function smtpServiceHook(sails) {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
async initialize() {
|
async initialize() {
|
||||||
if (sails.config.custom.smtpHost) {
|
if (!sails.config.custom.smtpHost) {
|
||||||
transporter = nodemailer.createTransport({
|
return;
|
||||||
pool: true,
|
|
||||||
host: sails.config.custom.smtpHost,
|
|
||||||
port: sails.config.custom.smtpPort,
|
|
||||||
secure: sails.config.custom.smtpSecure,
|
|
||||||
auth: sails.config.custom.smtpUser && {
|
|
||||||
user: sails.config.custom.smtpUser,
|
|
||||||
pass: sails.config.custom.smtpPassword,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
sails.log.info('SMTP hook has been loaded successfully');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sails.log.info('Initializing custom hook (`smtp`)');
|
||||||
|
|
||||||
|
transporter = nodemailer.createTransport({
|
||||||
|
pool: true,
|
||||||
|
host: sails.config.custom.smtpHost,
|
||||||
|
port: sails.config.custom.smtpPort,
|
||||||
|
secure: sails.config.custom.smtpSecure,
|
||||||
|
auth: sails.config.custom.smtpUser && {
|
||||||
|
user: sails.config.custom.smtpUser,
|
||||||
|
pass: sails.config.custom.smtpPassword,
|
||||||
|
},
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
getTransporter() {
|
getTransporter() {
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/**
|
||||||
|
* watcher hook
|
||||||
|
*
|
||||||
|
* @description :: A hook definition. Extends Sails by adding shadow routes, implicit actions,
|
||||||
|
* and/or initialization logic.
|
||||||
|
* @docs :: https://sailsjs.com/docs/concepts/extending-sails/hooks
|
||||||
|
*/
|
||||||
|
|
||||||
|
module.exports = function defineWatcherHook(sails) {
|
||||||
|
const checkSocketConnectionsToLogout = () => {
|
||||||
|
Object.keys(sails.io.sockets.adapter.rooms).forEach((room) => {
|
||||||
|
if (!room.startsWith('@accessToken:')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const accessToken = room.split(':')[1];
|
||||||
|
|
||||||
|
try {
|
||||||
|
sails.helpers.utils.verifyToken(accessToken);
|
||||||
|
} catch (error) {
|
||||||
|
sails.sockets.broadcast(room, 'logout');
|
||||||
|
sails.sockets.leaveAll(room);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
/**
|
||||||
|
* Runs when this Sails app loads/lifts.
|
||||||
|
*/
|
||||||
|
|
||||||
|
async initialize() {
|
||||||
|
sails.log.info('Initializing custom hook (`watcher`)');
|
||||||
|
|
||||||
|
setInterval(checkSocketConnectionsToLogout, 60 * 1000);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -5,7 +5,16 @@
|
|||||||
* @docs :: https://sailsjs.com/docs/concepts/models-and-orm/models
|
* @docs :: https://sailsjs.com/docs/concepts/models-and-orm/models
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
const SortTypes = {
|
||||||
|
NAME_ASC: 'name_asc',
|
||||||
|
DUE_DATE_ASC: 'dueDate_asc',
|
||||||
|
CREATED_AT_ASC: 'createdAt_asc',
|
||||||
|
CREATED_AT_DESC: 'createdAt_desc',
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
SortTypes,
|
||||||
|
|
||||||
attributes: {
|
attributes: {
|
||||||
// ╔═╗╦═╗╦╔╦╗╦╔╦╗╦╦ ╦╔═╗╔═╗
|
// ╔═╗╦═╗╦╔╦╗╦╔╦╗╦╦ ╦╔═╗╔═╗
|
||||||
// ╠═╝╠╦╝║║║║║ ║ ║╚╗╔╝║╣ ╚═╗
|
// ╠═╝╠╦╝║║║║║ ║ ║╚╗╔╝║╣ ╚═╗
|
||||||
|
|||||||
+10
-7
@@ -34,13 +34,6 @@ module.exports.custom = {
|
|||||||
defaultAdminEmail:
|
defaultAdminEmail:
|
||||||
process.env.DEFAULT_ADMIN_EMAIL && process.env.DEFAULT_ADMIN_EMAIL.toLowerCase(),
|
process.env.DEFAULT_ADMIN_EMAIL && process.env.DEFAULT_ADMIN_EMAIL.toLowerCase(),
|
||||||
|
|
||||||
smtpHost: process.env.SMTP_HOST,
|
|
||||||
smtpPort: process.env.SMTP_PORT || 587,
|
|
||||||
smtpSecure: process.env.SMTP_SECURE === 'true',
|
|
||||||
smtpUser: process.env.SMTP_USER,
|
|
||||||
smtpPassword: process.env.SMTP_PASSWORD,
|
|
||||||
smtpFrom: process.env.SMTP_FROM,
|
|
||||||
|
|
||||||
oidcIssuer: process.env.OIDC_ISSUER,
|
oidcIssuer: process.env.OIDC_ISSUER,
|
||||||
oidcClientId: process.env.OIDC_CLIENT_ID,
|
oidcClientId: process.env.OIDC_CLIENT_ID,
|
||||||
oidcClientSecret: process.env.OIDC_CLIENT_SECRET,
|
oidcClientSecret: process.env.OIDC_CLIENT_SECRET,
|
||||||
@@ -58,4 +51,14 @@ module.exports.custom = {
|
|||||||
oidcRedirectUri: `${
|
oidcRedirectUri: `${
|
||||||
sails.config.environment === 'production' ? process.env.BASE_URL : 'http://localhost:3000'
|
sails.config.environment === 'production' ? process.env.BASE_URL : 'http://localhost:3000'
|
||||||
}/oidc-callback`,
|
}/oidc-callback`,
|
||||||
|
|
||||||
|
smtpHost: process.env.SMTP_HOST,
|
||||||
|
smtpPort: process.env.SMTP_PORT || 587,
|
||||||
|
smtpSecure: process.env.SMTP_SECURE === 'true',
|
||||||
|
smtpUser: process.env.SMTP_USER,
|
||||||
|
smtpPassword: process.env.SMTP_PASSWORD,
|
||||||
|
smtpFrom: process.env.SMTP_FROM,
|
||||||
|
|
||||||
|
slackBotToken: process.env.SLACK_BOT_TOKEN,
|
||||||
|
slackChannelId: process.env.SLACK_CHANNEL_ID,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ module.exports.routes = {
|
|||||||
|
|
||||||
'POST /api/boards/:boardId/lists': 'lists/create',
|
'POST /api/boards/:boardId/lists': 'lists/create',
|
||||||
'PATCH /api/lists/:id': 'lists/update',
|
'PATCH /api/lists/:id': 'lists/update',
|
||||||
|
'POST /api/lists/:id/sort': 'lists/sort',
|
||||||
'DELETE /api/lists/:id': 'lists/delete',
|
'DELETE /api/lists/:id': 'lists/delete',
|
||||||
|
|
||||||
'POST /api/lists/:listId/cards': 'cards/create',
|
'POST /api/lists/:listId/cards': 'cards/create',
|
||||||
|
|||||||
Reference in New Issue
Block a user