Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d911030831 | ||
|
|
9d95ed6c41 | ||
|
|
1a5a853fa3 | ||
|
|
bb358e01dd | ||
|
|
9f0fce098e | ||
|
|
60ab09771d | ||
|
|
cb3ef783ba | ||
|
|
fe376b10c1 | ||
|
|
786441cda0 | ||
|
|
0d3cf0a32d | ||
|
|
b4e01d7256 | ||
|
|
73a641b935 | ||
|
|
6802a0dc69 | ||
|
|
81d6c43cd9 | ||
|
|
ca6a1a14f5 | ||
|
|
c096444acb | ||
|
|
51d05f3cd3 | ||
|
|
221da3c455 | ||
|
|
92098e136c | ||
|
|
fd5c33dd5d | ||
|
|
0c1c7e2192 | ||
|
|
b8d262f745 | ||
|
|
a1fd694248 | ||
|
|
634d6ceab1 | ||
|
|
31d4d5f38d | ||
|
|
3f99438402 | ||
|
|
7e7727e3e1 | ||
|
|
616304a1fa | ||
|
|
1e01148138 | ||
|
|
ede56e1ae3 | ||
|
|
b2e0c45539 | ||
|
|
389648b546 | ||
|
|
f4789c28db | ||
|
|
668092de7d | ||
|
|
920f9c097d | ||
|
|
da63598de3 | ||
|
|
517cb34cfe | ||
|
|
079b8eba53 | ||
|
|
af02cdd8bf | ||
|
|
e1bc189b88 | ||
|
|
5f2723623a | ||
|
|
fee6841d0a | ||
|
|
ca6fb3b962 | ||
|
|
28c3f28e01 | ||
|
|
80d12aaeeb | ||
|
|
89af209a2e | ||
|
|
f1fed3e533 | ||
|
|
eddeb96b16 | ||
|
|
9e8ff3b579 | ||
|
|
fc1278011c | ||
|
|
24163463fc | ||
|
|
fdef87e3b9 | ||
|
|
964498dbaa | ||
|
|
5b519cb62f | ||
|
|
11fc3b4485 | ||
|
|
37c0b59f82 | ||
|
|
239611ad51 | ||
|
|
0575e665fe | ||
|
|
019766dced | ||
|
|
6dc9e4ed99 | ||
|
|
d4b64b90fc | ||
|
|
1a49826b85 | ||
|
|
815643eb2c | ||
|
|
bcc4c0d923 | ||
|
|
cf7810b067 | ||
|
|
f1c72df8b6 | ||
|
|
5056d38848 | ||
|
|
3ef5b3ead8 | ||
|
|
ded58dc8b0 | ||
|
|
d8ee1ecdd1 | ||
|
|
fc2f4cd5d3 | ||
|
|
7ef457157e | ||
|
|
23ee815200 | ||
|
|
40c04c35ff | ||
|
|
743f2956c8 | ||
|
|
5bf5db27d8 | ||
|
|
667c5daf25 | ||
|
|
6662b0a717 | ||
|
|
348bf4d6c4 | ||
|
|
3ac2d289d0 | ||
|
|
3bc73c43ea | ||
|
|
8e0c60f5be | ||
|
|
aae69cb5e4 | ||
|
|
782c0356c8 | ||
|
|
757cdb14a4 | ||
|
|
8a4bdbd1fe | ||
|
|
5bf42be786 | ||
|
|
d896c3183b | ||
|
|
13ee0c3466 | ||
|
|
211c841379 | ||
|
|
90a30961ff | ||
|
|
7cb9774e05 | ||
|
|
875895b331 | ||
|
|
91bc889fed | ||
|
|
a34d8e9753 | ||
|
|
107cb85ba2 | ||
|
|
9333ef562e | ||
|
|
7d28abc7e6 | ||
|
|
5317950b5c | ||
|
|
7501619b7e | ||
|
|
080e29aa03 | ||
|
|
48c532b2c2 | ||
|
|
a62815f825 | ||
|
|
6938232dc4 | ||
|
|
4c4cfa9c66 | ||
|
|
ba89d41b19 | ||
|
|
5c435414f7 | ||
|
|
2d7812a679 | ||
|
|
d386c82973 | ||
|
|
6c4db967c2 | ||
|
|
932d8225ed | ||
|
|
0d481703da | ||
|
|
23e2b4a622 | ||
|
|
f4cc51e1c0 | ||
|
|
793ddd5e20 | ||
|
|
3d84888eb1 | ||
|
|
02eabd203c | ||
|
|
d0a2734161 | ||
|
|
eea57ff121 | ||
|
|
7e2b74627c | ||
|
|
bee199c13b | ||
|
|
8dd331b895 | ||
|
|
13f26b4be1 |
@@ -0,0 +1,57 @@
|
|||||||
|
name: Build and publish release package
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [created]
|
||||||
|
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-and-publish-release-package:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: '18'
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Workflow install pnpm
|
||||||
|
run: npm install pnpm -g
|
||||||
|
|
||||||
|
- name: Client install dependencies
|
||||||
|
run: pnpm install
|
||||||
|
|
||||||
|
- name: Server install dependencies
|
||||||
|
run: pnpm install
|
||||||
|
|
||||||
|
- name: Server include into dist
|
||||||
|
run: mv server/ dist/
|
||||||
|
|
||||||
|
- name: Client build production
|
||||||
|
run: |
|
||||||
|
npm run build
|
||||||
|
working-directory: ./client
|
||||||
|
|
||||||
|
- name: Client include into dist
|
||||||
|
run: |
|
||||||
|
mv build/index.html ../dist/views/index.ejs
|
||||||
|
mv build/* ../dist/public/
|
||||||
|
working-directory: ./client
|
||||||
|
|
||||||
|
- name: Dist include README.md SECURITY.md LICENSE start.sh
|
||||||
|
run: mv README.md SECURITY.md LICENSE start.sh dist/
|
||||||
|
|
||||||
|
- name: Dist Remove node modules
|
||||||
|
run: rm -R dist/node_modules
|
||||||
|
|
||||||
|
- name: Dist create .zip file
|
||||||
|
run: |
|
||||||
|
mv dist/ planka/
|
||||||
|
zip -r planka-prebuild-${{ github.event.release.tag_name }}.zip planka
|
||||||
|
|
||||||
|
- name: Dist upload assets
|
||||||
|
run: |
|
||||||
|
gh release upload ${{ github.event.release.tag_name }} planka-prebuild-${{ github.event.release.tag_name }}.zip
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
@@ -13,26 +13,26 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push-docker-base-image:
|
build-and-push-docker-base-image:
|
||||||
runs-on: ubuntu-latest
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v1
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v1
|
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
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v2
|
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
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
# https://docs.docker.com/build/ci/github-actions/multi-platform/
|
||||||
|
name: Build and push Docker DEV image
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths-ignore:
|
||||||
|
- '.github/**'
|
||||||
|
- 'charts/**'
|
||||||
|
- 'docker-*.sh'
|
||||||
|
- '*.md'
|
||||||
|
branches: [master]
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY_IMAGE: ghcr.io/plankanban/planka
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
strategy:
|
||||||
|
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:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ env.REGISTRY_IMAGE }}
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
- name: Login to GitHub Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Build and push by digest
|
||||||
|
id: build
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
platforms: ${{ matrix.platform }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
|
||||||
|
- name: Export digest
|
||||||
|
run: |
|
||||||
|
mkdir -p /tmp/digests
|
||||||
|
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
|
||||||
@@ -6,19 +6,19 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push-docker-image:
|
build-and-push-docker-image:
|
||||||
runs-on: ubuntu-latest
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v1
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -32,7 +32,7 @@ jobs:
|
|||||||
script: return context.payload.release.tag_name.replace('v', '')
|
script: return context.payload.release.tag_name.replace('v', '')
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v2
|
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
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
name: Release Charts
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- "charts/**"
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
# depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
|
||||||
|
# see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
runs-on: self-hosted
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Configure Git
|
||||||
|
run: |
|
||||||
|
git config user.name "$GITHUB_ACTOR"
|
||||||
|
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
|
||||||
|
|
||||||
|
- name: Install Helm
|
||||||
|
uses: azure/setup-helm@v3
|
||||||
|
|
||||||
|
- name: Add repositories
|
||||||
|
run: |
|
||||||
|
for dir in $(ls -d charts/*/); do
|
||||||
|
helm dependency list $dir 2> /dev/null | tail +2 | head -n -1 | awk '{ print "helm repo add " $1 " " $3 }' | while read cmd; do $cmd; done
|
||||||
|
done
|
||||||
|
|
||||||
|
- name: Run chart-releaser for stable
|
||||||
|
uses: helm/chart-releaser-action@v1.6.0
|
||||||
|
with:
|
||||||
|
charts_dir: charts
|
||||||
|
mark_as_latest: false
|
||||||
|
env:
|
||||||
|
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
@@ -10,3 +10,6 @@ docker-compose.override.yml
|
|||||||
# `npm i --package-lock-only`
|
# `npm i --package-lock-only`
|
||||||
pnpm-lock.yaml
|
pnpm-lock.yaml
|
||||||
yarn.lock
|
yarn.lock
|
||||||
|
|
||||||
|
# Chart dependencies
|
||||||
|
**/charts/*.tgz
|
||||||
|
|||||||
+23
-8
@@ -1,33 +1,44 @@
|
|||||||
FROM ghcr.io/plankanban/planka:base-latest as server-dependencies
|
FROM node:18-alpine as server-dependencies
|
||||||
|
|
||||||
|
RUN apk -U upgrade \
|
||||||
|
&& apk add build-base python3 \
|
||||||
|
--no-cache
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY server/package.json server/package-lock.json .
|
COPY server/package.json server/package-lock.json ./
|
||||||
|
|
||||||
RUN npm install npm@latest --global \
|
RUN npm install npm@latest --global \
|
||||||
&& npm clean-install --omit=dev
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
|
&& pnpm install --prod
|
||||||
|
|
||||||
FROM node:lts AS client
|
FROM node:lts AS client
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY client/package.json client/package-lock.json .
|
COPY client/package.json client/package-lock.json ./
|
||||||
|
|
||||||
RUN npm install npm@latest --global \
|
RUN npm install npm@latest --global \
|
||||||
&& npm clean-install --omit=dev
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
|
&& pnpm install --prod
|
||||||
|
|
||||||
COPY client .
|
COPY client .
|
||||||
RUN DISABLE_ESLINT_PLUGIN=true npm run build
|
RUN DISABLE_ESLINT_PLUGIN=true npm run build
|
||||||
|
|
||||||
FROM ghcr.io/plankanban/planka:base-latest
|
FROM node:18-alpine
|
||||||
|
|
||||||
RUN apk del vips-dependencies --purge
|
RUN apk -U upgrade \
|
||||||
|
&& apk add bash \
|
||||||
|
--no-cache
|
||||||
|
|
||||||
USER node
|
USER node
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --chown=node:node start.sh .
|
COPY --chown=node:node start.sh .
|
||||||
COPY --chown=node:node server .
|
COPY --chown=node:node server .
|
||||||
|
COPY --chown=node:node healthcheck.js .
|
||||||
|
|
||||||
RUN mv .env.sample .env
|
RUN mv .env.sample .env
|
||||||
|
|
||||||
@@ -42,4 +53,8 @@ VOLUME /app/private/attachments
|
|||||||
|
|
||||||
EXPOSE 1337
|
EXPOSE 1337
|
||||||
|
|
||||||
CMD ["./start.sh"]
|
HEALTHCHECK --interval=10s --timeout=2s --start-period=15s \
|
||||||
|
CMD node ./healthcheck.js
|
||||||
|
|
||||||
|
|
||||||
|
CMD [ "bash", "start.sh" ]
|
||||||
|
|||||||
+12
-17
@@ -1,27 +1,22 @@
|
|||||||
FROM node:lts-alpine
|
FROM node:18-alpine
|
||||||
|
|
||||||
ARG ALPINE_VERSION=3.16
|
ARG VIPS_VERSION=8.14.5
|
||||||
ARG VIPS_VERSION=8.13.3
|
|
||||||
|
|
||||||
RUN apk -U upgrade \
|
RUN apk -U upgrade \
|
||||||
&& apk add \
|
&& apk add \
|
||||||
bash giflib glib lcms2 libexif \
|
bash pkgconf \
|
||||||
libgsf libjpeg-turbo libpng librsvg libwebp \
|
libjpeg-turbo libexif librsvg cgif tiff libspng libimagequant \
|
||||||
orc pango tiff \
|
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/community/ \
|
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/main/ \
|
|
||||||
--no-cache \
|
--no-cache \
|
||||||
&& apk add \
|
&& apk add \
|
||||||
build-base giflib-dev glib-dev lcms2-dev libexif-dev \
|
build-base gobject-introspection-dev meson \
|
||||||
libgsf-dev libjpeg-turbo-dev libpng-dev librsvg-dev libwebp-dev \
|
libjpeg-turbo-dev libexif-dev librsvg-dev cgif-dev tiff-dev libspng-dev libimagequant-dev \
|
||||||
orc-dev pango-dev tiff-dev \
|
|
||||||
--virtual vips-dependencies \
|
--virtual vips-dependencies \
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/community/ \
|
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/main/ \
|
|
||||||
--no-cache \
|
--no-cache \
|
||||||
&& wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.gz | tar xzC /tmp \
|
&& wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz | tar xJC /tmp \
|
||||||
&& cd /tmp/vips-${VIPS_VERSION} \
|
&& cd /tmp/vips-${VIPS_VERSION} \
|
||||||
&& ./configure \
|
&& meson setup build-dir \
|
||||||
&& make \
|
&& cd build-dir \
|
||||||
&& make install-strip \
|
&& ninja \
|
||||||
|
&& ninja test \
|
||||||
|
&& ninja install \
|
||||||
&& rm -rf /tmp/vips-${VIPS_VERSION}
|
&& rm -rf /tmp/vips-${VIPS_VERSION}
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
# Planka
|
# Planka
|
||||||
|
#### Elegant open source project tracking.
|
||||||
|
|
||||||
  
|
  
|
||||||
|
|
||||||
A Trello-like kanban board built with React and Redux.
|
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
[**Client demo**](https://plankanban.github.io/planka) (without server features).
|
[**Client demo**](https://plankanban.github.io/planka) (without server features).
|
||||||
@@ -11,314 +10,31 @@ A Trello-like kanban board built with React and Redux.
|
|||||||
## Features
|
## Features
|
||||||
|
|
||||||
- Create projects, boards, lists, cards, labels and tasks
|
- Create projects, boards, lists, cards, labels and tasks
|
||||||
- Add card members, track time, set a due date, add attachments, write comments
|
- Add card members, track time, set due dates, add attachments, write comments
|
||||||
- Markdown support in a card description and comment
|
- Markdown support in card description and comments
|
||||||
- Filter by members and labels
|
- Filter by members and labels
|
||||||
- Customize project background
|
- Customize project backgrounds
|
||||||
- Real-time updates
|
- Real-time updates
|
||||||
- User notifications
|
- Internal notifications
|
||||||
- Internationalization
|
- Multiple interface languages
|
||||||
|
- Single sign-on via OpenID Connect
|
||||||
|
|
||||||
## Deploy
|
## How to deploy Planka
|
||||||
|
|
||||||
There are 2 types of installation:
|
There are many ways to install Planka, [check them out](https://docs.planka.cloud/docs/intro).
|
||||||
1. [Dockerized](#1-docker-compose)
|
|
||||||
2. [Without Docker](#2-without-docker)
|
|
||||||
|
|
||||||
### 1. Docker Compose
|
For configuration, please see the [configuration section](https://docs.planka.cloud/docs/category/configuration).
|
||||||
|
|
||||||
[](https://github.com/plankanban/planka/pkgs/container/planka)
|
## Contact
|
||||||
|
|
||||||
- Make sure you have [Docker](https://docs.docker.com/install/) and [Docker Compose](https://docs.docker.com/compose/install/) installed and operational.
|
- If you want to get a hosted version of Planka, you can contact us via email contact@planka.cloud
|
||||||
- Create `docker-compose.yml` based on [the example](https://raw.githubusercontent.com/plankanban/planka/master/docker-compose.yml). This is the ONLY file you will need. You can create this file on your own machine by copy and pasting the content.
|
- For any security issues, please do not create a public issue on GitHub, instead please write to security@planka.cloud
|
||||||
- Edit `BASE_URL` to match your domain name or IP address.
|
|
||||||
- Edit `SECRET_KEY` with random value. You can generate it by `openssl rand -hex 64`.
|
|
||||||
|
|
||||||
Download the docker-compose.yml:
|
We do NOT offer any public support via email, please use GitHub.
|
||||||
|
|
||||||
```
|
|
||||||
curl -L https://raw.githubusercontent.com/plankanban/planka/master/docker-compose.yml -o docker-compose.yml
|
|
||||||
```
|
|
||||||
|
|
||||||
Pull images and start services:
|
|
||||||
|
|
||||||
```
|
|
||||||
docker-compose up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
Demo user: demo@demo.demo demo
|
|
||||||
|
|
||||||
### 2. Without Docker
|
|
||||||
|
|
||||||
Installing without Docker is a bit more complicated, here's what you need to do:
|
|
||||||
|
|
||||||
1. Clone this repository into a directory of your choice. (e.g. `/var/www/planka`)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
mkdir -p /var/www/planka
|
|
||||||
cd /var/www/planka
|
|
||||||
git clone https://github.com/plankanban/planka.git .
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Install dependencies and build the client.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npm install
|
|
||||||
npm run client:build
|
|
||||||
```
|
|
||||||
|
|
||||||
**Note**: You can use `yarn` or `pnpm` instead of `npm`.
|
|
||||||
|
|
||||||
3. Copy the content of the `client/build` directory to the server.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cp -r client/build/. server/public
|
|
||||||
cp client/build/index.html server/views/index.ejs
|
|
||||||
```
|
|
||||||
|
|
||||||
4. Copy the start script and navigate to the `server` directory.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cp start.sh server
|
|
||||||
cd server
|
|
||||||
```
|
|
||||||
|
|
||||||
5. Configure environment variables.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cp .env.sample .env
|
|
||||||
|
|
||||||
# Edit .env file (You could use nano, vim, etc.)
|
|
||||||
nano .env
|
|
||||||
```
|
|
||||||
|
|
||||||
**Note**: Before continuing, make sure you have your selected database created and running.
|
|
||||||
|
|
||||||
6. Start the server.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./start.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
**Note**: You can use `pm2` or `systemd` to run the server in the background.
|
|
||||||
|
|
||||||
## Additional information
|
|
||||||
|
|
||||||
### Nginx configuration
|
|
||||||
|
|
||||||
Here is an example of Nginx configuration for Planka, make sure to replace `<domain>` with your domain name, and make sure to configure the SSL.
|
|
||||||
|
|
||||||
```nginx
|
|
||||||
upstream planka {
|
|
||||||
server localhost:1337;
|
|
||||||
keepalive 32;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl http2;
|
|
||||||
listen [::]:443 ssl http2;
|
|
||||||
server_name <domain>;
|
|
||||||
|
|
||||||
access_log /var/log/nginx/planka-access.log;
|
|
||||||
error_log /var/log/nginx/planka-error.log error;
|
|
||||||
|
|
||||||
# SSL Configuration - Replace the example <domain> with your domain
|
|
||||||
ssl_certificate /etc/letsencrypt/live/<domain>/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/<domain>/privkey.pem;
|
|
||||||
ssl_session_cache shared:SSL:10m;
|
|
||||||
ssl_protocols TLSv1.2 TLSv1.3;
|
|
||||||
ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
|
|
||||||
ssl_prefer_server_ciphers on;
|
|
||||||
|
|
||||||
client_max_body_size 120M;
|
|
||||||
add_header Access-Control-Allow-Origin *;
|
|
||||||
add_header Access-Control-Max-Age 3600;
|
|
||||||
add_header Access-Control-Expose-Headers Content-Length;
|
|
||||||
add_header Access-Control-Allow-Headers Range;
|
|
||||||
|
|
||||||
# Make sure to allow socket.io connections
|
|
||||||
location ~* \.io {
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
client_max_body_size 50M;
|
|
||||||
proxy_set_header Host $http_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_set_header X-Frame-Options SAMEORIGIN;
|
|
||||||
proxy_buffers 256 16k;
|
|
||||||
proxy_buffer_size 16k;
|
|
||||||
client_body_timeout 60;
|
|
||||||
send_timeout 300;
|
|
||||||
lingering_timeout 5;
|
|
||||||
proxy_connect_timeout 1d;
|
|
||||||
proxy_send_timeout 1d;
|
|
||||||
proxy_read_timeout 1d;
|
|
||||||
proxy_pass http://planka;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
client_max_body_size 50M;
|
|
||||||
proxy_set_header Connection "";
|
|
||||||
proxy_set_header Host $http_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_set_header X-Frame-Options SAMEORIGIN;
|
|
||||||
proxy_buffers 256 16k;
|
|
||||||
proxy_buffer_size 16k;
|
|
||||||
proxy_read_timeout 600s;
|
|
||||||
proxy_cache_revalidate on;
|
|
||||||
proxy_cache_min_uses 2;
|
|
||||||
proxy_cache_use_stale timeout;
|
|
||||||
proxy_cache_lock on;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_pass http://planka;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Logging
|
|
||||||
|
|
||||||
Planka currently allows you to expose the application's logfile directory to the host machine via a shared volume. This feature is not enabled by default.
|
|
||||||
|
|
||||||
To expose the logfile director to the host machine, add the item `./logs/:/app/logs/` under `services.planka.volumes`.
|
|
||||||
|
|
||||||
Note that the directory to the left of the semicolon is regarding the host machine while the directory to the right of the semicolon is regarding the Docker container.
|
|
||||||
|
|
||||||
For example, in the above step, `./logs/:/app/logs/` will create the folder `logs` in the same directory where the `docker-compose.yml` file lives.
|
|
||||||
|
|
||||||
### Rotating Logs
|
|
||||||
|
|
||||||
Logrotate is designed to ease administration of systems that generate large numbers of log files. It allows automatic rotation, compression, removal, and mailing of log files. Each log file may be handled daily, weekly, monthly, or when it grows too large.
|
|
||||||
|
|
||||||
#### Setup logrotate for Planka logs
|
|
||||||
|
|
||||||
Create a file in `/etc/logrotate.d` named `planka` with the following contents:
|
|
||||||
|
|
||||||
```
|
|
||||||
/path/to/planka/logs/planka.log {
|
|
||||||
daily
|
|
||||||
missingok
|
|
||||||
rotate 14
|
|
||||||
compress
|
|
||||||
delaycompress
|
|
||||||
notifempty
|
|
||||||
create 640 root adm
|
|
||||||
sharedscripts
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Ensure to replace logfile directory with your installation’s `/logs/planka.log` location.
|
|
||||||
|
|
||||||
Restart the logrotate service.
|
|
||||||
|
|
||||||
### Fail2ban
|
|
||||||
|
|
||||||
Fail2ban is a service that uses iptables to automatically drop connections for a pre-defined amount of time from IPs that continuously failed to authenticate to the configured services.
|
|
||||||
|
|
||||||
#### Setup a filter and a jail for Planka
|
|
||||||
|
|
||||||
A filter defines regex rules to identify when users fail to authenticate on Planka's user interface.
|
|
||||||
|
|
||||||
Create a file in `/etc/fail2ban/filter.d` named `planka.conf` with the following contents:
|
|
||||||
|
|
||||||
```conf
|
|
||||||
[Definition]
|
|
||||||
failregex = ^(.*) Invalid (email or username:|password!) (\"(.*)\"!)? ?\(IP: <ADDR>\)$
|
|
||||||
ignoreregex =
|
|
||||||
```
|
|
||||||
|
|
||||||
The jail file defines how to handle the failed authentication attempts found by the Planka filter.
|
|
||||||
|
|
||||||
Create a file in `/etc/fail2ban/jail.d` named `planka.local` with the following contents:
|
|
||||||
|
|
||||||
```conf
|
|
||||||
[planka]
|
|
||||||
enabled = true
|
|
||||||
port = http,https
|
|
||||||
filter = planka
|
|
||||||
logpath = /path/to/planka/logs/planka.log
|
|
||||||
maxretry = 5
|
|
||||||
bantime = 900
|
|
||||||
```
|
|
||||||
|
|
||||||
Ensure to replace `logpath`'s value with your installation’s `/logs/planka.log` location. If you are using ports other than 80 and 443 for your Web server you should replace those too. The bantime and findtime are defined in seconds.
|
|
||||||
|
|
||||||
Restart the fail2ban service. You can check the status of your Planka jail by running:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
fail2ban-client status planka
|
|
||||||
```
|
|
||||||
|
|
||||||
### Import from Trello
|
|
||||||
|
|
||||||
It's already available in Planka, or you can also use the great tool [trello2planka](https://github.com/christophenne/trello2planka) to do the import.
|
|
||||||
|
|
||||||
### Backup and Restore
|
|
||||||
|
|
||||||
Planka comes with two scripts that allow for manual backup and restore when running Planka with docker-compose.yml.
|
|
||||||
Backups can be triggered with `docker-backup.sh` which will export the Database, User Avatars, Project Backgrounds and Attachments into a single tgz file.
|
|
||||||
|
|
||||||
```
|
|
||||||
$ ./docker-backup.sh
|
|
||||||
Exporting postgres database ... Success!
|
|
||||||
Exporting user-avatars ... Success!
|
|
||||||
Exporting project-background-images ... Success!
|
|
||||||
Exporting attachments ... Success!
|
|
||||||
Creating final tarball 2023-01-17T15-37-22Z-backup.tgz ... Success!
|
|
||||||
Cleaning up temporary files and folders ... Success!
|
|
||||||
Backup Complete!
|
|
||||||
```
|
|
||||||
|
|
||||||
The resulting backup can be restored using the `docker-restore.sh` script.
|
|
||||||
|
|
||||||
```
|
|
||||||
$ ./docker-restore.sh 2023-01-17T15-37-22Z-backup.tgz
|
|
||||||
Extracting tarball 2023-01-17T11-10-54Z-backup.tgz ... Success!
|
|
||||||
Importing postgres database ...
|
|
||||||
|
|
||||||
[Many lines of postgres output]
|
|
||||||
...
|
|
||||||
|
|
||||||
Success!
|
|
||||||
Importing user-avatars ... Success!
|
|
||||||
Importing project-background-images ... Success!
|
|
||||||
Importing attachments ... Success!
|
|
||||||
Cleaning up temporary files and folders ... Success!
|
|
||||||
Restore complete!
|
|
||||||
```
|
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
Clone the repository and install dependencies:
|
See the [development section](https://docs.planka.cloud/docs/Development).
|
||||||
|
|
||||||
```
|
|
||||||
git clone https://github.com/plankanban/planka.git
|
|
||||||
|
|
||||||
cd planka
|
|
||||||
npm install
|
|
||||||
```
|
|
||||||
|
|
||||||
Either use a local database or start the provided development database:
|
|
||||||
|
|
||||||
```
|
|
||||||
docker-compose -f docker-compose-dev.yml up
|
|
||||||
```
|
|
||||||
|
|
||||||
Create `server/.env` based on `server/.env.sample` and edit `DATABASE_URL` if needed, then initialize the database:
|
|
||||||
|
|
||||||
```
|
|
||||||
npm run server:db:init
|
|
||||||
```
|
|
||||||
|
|
||||||
Start the development server:
|
|
||||||
|
|
||||||
```
|
|
||||||
npm start
|
|
||||||
```
|
|
||||||
|
|
||||||
Demo user: demo@demo.demo demo
|
|
||||||
|
|
||||||
## Tech stack
|
## Tech stack
|
||||||
|
|
||||||
@@ -329,3 +45,7 @@ Demo user: demo@demo.demo demo
|
|||||||
## License
|
## License
|
||||||
|
|
||||||
Planka is [AGPL-3.0 licensed](https://github.com/plankanban/planka/blob/master/LICENSE).
|
Planka is [AGPL-3.0 licensed](https://github.com/plankanban/planka/blob/master/LICENSE).
|
||||||
|
|
||||||
|
## Contributors
|
||||||
|
|
||||||
|
[](https://github.com/plankanban/planka/graphs/contributors)
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ Most recent release.
|
|||||||
|
|
||||||
## Reporting a Vulnerability
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
Please report any security issues you discovered to meltyshev@gmail.com. If the issue is confirmed, we will release a patch as soon as possible depending on complexity.
|
Please report any security issues you discovered to security@planka.cloud. If the issue is confirmed, we will release a patch as soon as possible depending on complexity.
|
||||||
|
|
||||||
**Do NOT create public issues on GitHub for security vulnerabilities.**
|
**Do NOT create public issues on GitHub for security vulnerabilities.**
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# Patterns to ignore when building packages.
|
||||||
|
# This supports shell glob matching, relative path matching, and
|
||||||
|
# negation (prefixed with !). Only one pattern per line.
|
||||||
|
.DS_Store
|
||||||
|
# Common VCS dirs
|
||||||
|
.git/
|
||||||
|
.gitignore
|
||||||
|
.bzr/
|
||||||
|
.bzrignore
|
||||||
|
.hg/
|
||||||
|
.hgignore
|
||||||
|
.svn/
|
||||||
|
# Common backup files
|
||||||
|
*.swp
|
||||||
|
*.bak
|
||||||
|
*.tmp
|
||||||
|
*.orig
|
||||||
|
*~
|
||||||
|
# Various IDEs
|
||||||
|
.project
|
||||||
|
.idea/
|
||||||
|
*.tmproj
|
||||||
|
.vscode/
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
dependencies:
|
||||||
|
- name: postgresql
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
version: 12.5.1
|
||||||
|
digest: sha256:01dfb2d07ab6800b4a5a6c81f20f3377a758124b2b96b891d0cd6b4f64cf783b
|
||||||
|
generated: "2023-05-15T00:54:48.1308917+01:00"
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
apiVersion: v2
|
||||||
|
name: planka
|
||||||
|
description: A Helm chart to deploy Planka and it's dependencies.
|
||||||
|
|
||||||
|
# A chart can be either an 'application' or a 'library' chart.
|
||||||
|
#
|
||||||
|
# Application charts are a collection of templates that can be packaged into versioned archives
|
||||||
|
# to be deployed.
|
||||||
|
#
|
||||||
|
# Library charts provide useful utilities or functions for the chart developer. They're included as
|
||||||
|
# a dependency of application charts to inject those utilities and functions into the rendering
|
||||||
|
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
|
||||||
|
type: application
|
||||||
|
|
||||||
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
|
# to the chart and its templates, including the app version.
|
||||||
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
|
version: 0.1.20
|
||||||
|
|
||||||
|
# This is the version number of the application being deployed. This version number should be
|
||||||
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
|
# It is recommended to use it with quotes.
|
||||||
|
appVersion: "1.16.1"
|
||||||
|
|
||||||
|
dependencies:
|
||||||
|
- alias: postgresql
|
||||||
|
condition: postgresql.enabled
|
||||||
|
name: postgresql
|
||||||
|
repository: &bitnami-repo https://charts.bitnami.com/bitnami
|
||||||
|
version: 12.5.1
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
# Planka Helm Chart
|
||||||
|
|
||||||
|
[Planka](https://github.com/plankanban/planka) is an OSS alternative to Trello that you can host yourself, and this is a Helm Chart to make it easier to deploy to K8s.
|
||||||
|
|
||||||
|
Shoutout to [this issue](https://github.com/plankanban/planka/issues/192) who have been asking for this Helm Chart.
|
||||||
|
|
||||||
|
## Issues
|
||||||
|
|
||||||
|
By using the Bitnami chart for PostgreSQL, there is an issue where once deployed, if trying to use a different password then it will be ignored as the Persistant Volume (PV) will already exist with the previous password. See warning from Bitnami below:
|
||||||
|
|
||||||
|
> **Warning!** Setting a password will be ignored on new installation in the case when previous Posgresql release was deleted through the helm command. In that case, old PVC will have an old password, and setting it through helm won't take effect. Deleting persistent volumes (PVs) will solve the issue. Refer to [issue 2061](https://github.com/bitnami/charts/issues/2061) for more details
|
||||||
|
|
||||||
|
If you want to fully uninstall this chart including the data, follow [these steps](https://github.com/bitnami/charts/blob/main/bitnami/postgresql/README.md#uninstalling-the-chart) from the Bitnami Chart's docs.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
The basic usage of the chart can be found below:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/Chris-Greaves/planka-helm-chart.git
|
||||||
|
cd planka-helm-chart
|
||||||
|
helm dependency build
|
||||||
|
export SECRETKEY=$(openssl rand -hex 64)
|
||||||
|
helm install planka . --set secretkey=$SECRETKEY \
|
||||||
|
--set admin_email="demo@demo.demo" \
|
||||||
|
--set admin_password="demo" \
|
||||||
|
--set admin_name="Demo Demo" \
|
||||||
|
--set admin_username="demo"
|
||||||
|
```
|
||||||
|
|
||||||
|
> **NOTE:** The command `openssl rand -hex 64` is needed to create a random hexadecimal key for planka. On Windows you can use Git Bash to run that command.
|
||||||
|
|
||||||
|
To access Planka you can port forward using the following command:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
kubectl port-forward $POD_NAME 3000:1337
|
||||||
|
```
|
||||||
|
|
||||||
|
### Accessing Externally
|
||||||
|
|
||||||
|
To access Planka externally you can use the following configuration
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# HTTP only
|
||||||
|
helm install planka . --set secretkey=$SECRETKEY \
|
||||||
|
--set admin_email="demo@demo.demo" \
|
||||||
|
--set admin_password="demo" \
|
||||||
|
--set admin_name="Demo Demo" \
|
||||||
|
--set admin_username="demo"
|
||||||
|
--set ingress.enabled=true \
|
||||||
|
--set ingress.hosts[0].host=planka.example.dev \
|
||||||
|
|
||||||
|
# HTTPS
|
||||||
|
helm install planka . --set secretkey=$SECRETKEY \
|
||||||
|
--set admin_email="demo@demo.demo" \
|
||||||
|
--set admin_password="demo" \
|
||||||
|
--set admin_name="Demo Demo" \
|
||||||
|
--set admin_username="demo"
|
||||||
|
--set ingress.enabled=true \
|
||||||
|
--set ingress.hosts[0].host=planka.example.dev \
|
||||||
|
--set ingress.tls[0].secretName=planka-tls \
|
||||||
|
--set ingress.tls[0].hosts[0]=planka.example.dev \
|
||||||
|
```
|
||||||
|
|
||||||
|
or create a values.yaml file like:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
secretkey: "<InsertSecretKey>"
|
||||||
|
# The admin section needs to be present for new instances of Planka, after the first start you can remove the lines starting with admin_. If you want the admin user to be unchangeable admin_email: has to stay
|
||||||
|
# After changing the config you have to run ```helm upgrade planka . -f values.yaml```
|
||||||
|
|
||||||
|
# Admin user
|
||||||
|
admin_email: "demo@demo.demo" # Do not remove if you want to prevent this user from being edited/deleted
|
||||||
|
admin_password: "demo"
|
||||||
|
admin_name: "Demo Demo"
|
||||||
|
admin_username: "demo"
|
||||||
|
# Admin user
|
||||||
|
|
||||||
|
ingress:
|
||||||
|
enabled: true
|
||||||
|
hosts:
|
||||||
|
- host: planka.example.dev
|
||||||
|
paths:
|
||||||
|
- path: /
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
|
||||||
|
# Needed for HTTPS
|
||||||
|
tls:
|
||||||
|
- secretName: planka-tls # existing TLS secret in k8s
|
||||||
|
hosts:
|
||||||
|
- planka.example.dev
|
||||||
|
```
|
||||||
|
|
||||||
|
```bash
|
||||||
|
helm install planka . -f values.yaml
|
||||||
|
```
|
||||||
|
|
||||||
|
### Things to consider if production hosting
|
||||||
|
|
||||||
|
If you want to host Planka for more than just playing around with, you might want to do the following things:
|
||||||
|
|
||||||
|
- Create a `values.yaml` with your config, as this will make applying upgrades much easier in the future.
|
||||||
|
- Create your `secretkey` once and store it either in a secure vault, or in your `values.yaml` file so it will be the same for upgrading in the future.
|
||||||
|
- Specify a password for `postgresql.auth.password` as there have been issues with the postgresql chart generating new passwords locking you out of the data you've already stored. (see [this issue](https://github.com/bitnami/charts/issues/2061))
|
||||||
|
|
||||||
|
Any questions or concerns, [raise an issue](https://github.com/Chris-Greaves/planka-helm-chart/issues/new).
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
1. Get the application URL by running these commands:
|
||||||
|
{{- if .Values.ingress.enabled }}
|
||||||
|
{{- range $host := .Values.ingress.hosts }}
|
||||||
|
{{- range .paths }}
|
||||||
|
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- else if contains "NodePort" .Values.service.type }}
|
||||||
|
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "planka.fullname" . }})
|
||||||
|
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
|
||||||
|
echo http://$NODE_IP:$NODE_PORT
|
||||||
|
{{- else if contains "LoadBalancer" .Values.service.type }}
|
||||||
|
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
|
||||||
|
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "planka.fullname" . }}'
|
||||||
|
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "planka.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
|
||||||
|
echo http://$SERVICE_IP:{{ .Values.service.port }}
|
||||||
|
{{- else if contains "ClusterIP" .Values.service.type }}
|
||||||
|
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "planka.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
|
||||||
|
export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
|
||||||
|
echo "Visit http://localhost:3000 to use your application"
|
||||||
|
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 3000:$CONTAINER_PORT
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
{{/*
|
||||||
|
Expand the name of the chart.
|
||||||
|
*/}}
|
||||||
|
{{- define "planka.name" -}}
|
||||||
|
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Create a default fully qualified app name.
|
||||||
|
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
||||||
|
If release name contains chart name it will be used as a full name.
|
||||||
|
*/}}
|
||||||
|
{{- define "planka.fullname" -}}
|
||||||
|
{{- if .Values.fullnameOverride }}
|
||||||
|
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
|
||||||
|
{{- else }}
|
||||||
|
{{- $name := default .Chart.Name .Values.nameOverride }}
|
||||||
|
{{- if contains $name .Release.Name }}
|
||||||
|
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
|
||||||
|
{{- else }}
|
||||||
|
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Create chart name and version as used by the chart label.
|
||||||
|
*/}}
|
||||||
|
{{- define "planka.chart" -}}
|
||||||
|
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Common labels
|
||||||
|
*/}}
|
||||||
|
{{- define "planka.labels" -}}
|
||||||
|
helm.sh/chart: {{ include "planka.chart" . }}
|
||||||
|
{{ include "planka.selectorLabels" . }}
|
||||||
|
{{- if .Chart.AppVersion }}
|
||||||
|
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||||
|
{{- end }}
|
||||||
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Selector labels
|
||||||
|
*/}}
|
||||||
|
{{- define "planka.selectorLabels" -}}
|
||||||
|
app.kubernetes.io/name: {{ include "planka.name" . }}
|
||||||
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Create the name of the service account to use
|
||||||
|
*/}}
|
||||||
|
{{- define "planka.serviceAccountName" -}}
|
||||||
|
{{- if .Values.serviceAccount.create }}
|
||||||
|
{{- default (include "planka.fullname" .) .Values.serviceAccount.name }}
|
||||||
|
{{- else }}
|
||||||
|
{{- default "default" .Values.serviceAccount.name }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: {{ include "planka.fullname" . }}
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
{{- if not .Values.autoscaling.enabled }}
|
||||||
|
replicas: {{ .Values.replicaCount }}
|
||||||
|
{{- end }}
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
{{- include "planka.selectorLabels" . | nindent 6 }}
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
{{- with .Values.podAnnotations }}
|
||||||
|
annotations:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
labels:
|
||||||
|
{{- include "planka.selectorLabels" . | nindent 8 }}
|
||||||
|
spec:
|
||||||
|
{{- with .Values.imagePullSecrets }}
|
||||||
|
imagePullSecrets:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
serviceAccountName: {{ include "planka.serviceAccountName" . }}
|
||||||
|
securityContext:
|
||||||
|
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
||||||
|
containers:
|
||||||
|
- name: {{ .Chart.Name }}
|
||||||
|
securityContext:
|
||||||
|
{{- toYaml .Values.securityContext | nindent 12 }}
|
||||||
|
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
||||||
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||||
|
ports:
|
||||||
|
- name: http
|
||||||
|
containerPort: {{ .Values.service.containerPort | default 1337 }}
|
||||||
|
protocol: TCP
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /
|
||||||
|
port: http
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /
|
||||||
|
port: http
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /app/public/user-avatars
|
||||||
|
subPath: user-avatars
|
||||||
|
name: planka
|
||||||
|
- mountPath: /app/public/project-background-images
|
||||||
|
subPath: project-background-images
|
||||||
|
name: planka
|
||||||
|
- mountPath: /app/private/attachments
|
||||||
|
subPath: attachments
|
||||||
|
name: planka
|
||||||
|
resources:
|
||||||
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
|
env:
|
||||||
|
- name: DATABASE_URL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: planka-postgresql-svcbind-custom-user
|
||||||
|
key: uri
|
||||||
|
- name: BASE_URL
|
||||||
|
{{- if .Values.baseUrl }}
|
||||||
|
value: {{ .Values.baseUrl }}
|
||||||
|
{{- else if .Values.ingress.enabled }}
|
||||||
|
value: {{ printf "https://%s" (first .Values.ingress.hosts).host }}
|
||||||
|
{{- else }}
|
||||||
|
value: http://localhost:3000
|
||||||
|
{{- end }}
|
||||||
|
- name: SECRET_KEY
|
||||||
|
value: {{ required "A secret key needs to be generated using 'openssl rand -hex 64' and assigned to secretkey." .Values.secretkey }}
|
||||||
|
- name: TRUST_PROXY
|
||||||
|
value: "0"
|
||||||
|
- name: DEFAULT_ADMIN_EMAIL
|
||||||
|
value: {{ .Values.admin_email }}
|
||||||
|
- name: DEFAULT_ADMIN_PASSWORD
|
||||||
|
value: {{ .Values.admin_password }}
|
||||||
|
- name: DEFAULT_ADMIN_NAME
|
||||||
|
value: {{ .Values.admin_name }}
|
||||||
|
- name: DEFAULT_ADMIN_USERNAME
|
||||||
|
value: {{ .Values.admin_username }}
|
||||||
|
{{ range $k, $v := .Values.env }}
|
||||||
|
- name: {{ $k | quote }}
|
||||||
|
value: {{ $v | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.oidc.enabled }}
|
||||||
|
{{- $secretName := default (printf "%s-oidc" (include "planka.fullname" .)) .Values.oidc.existingSecret }}
|
||||||
|
- name: OIDC_CLIENT_ID
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: clientId
|
||||||
|
name: {{ $secretName }}
|
||||||
|
- name: OIDC_CLIENT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: clientSecret
|
||||||
|
name: {{ $secretName }}
|
||||||
|
- name: OIDC_ISSUER
|
||||||
|
value: {{ required "issuerUrl is required when configuring OIDC" .Values.oidc.issuerUrl | quote }}
|
||||||
|
- name: OIDC_SCOPES
|
||||||
|
value: {{ join " " .Values.oidc.scopes | default "openid profile email" | quote }}
|
||||||
|
{{- if .Values.oidc.admin.roles }}
|
||||||
|
- name: OIDC_ADMIN_ROLES
|
||||||
|
value: {{ join "," .Values.oidc.admin.roles | quote }}
|
||||||
|
{{- end }}
|
||||||
|
- name: OIDC_ROLES_ATTRIBUTE
|
||||||
|
value: {{ .Values.oidc.admin.rolesAttribute | default "groups" | quote }}
|
||||||
|
{{- if .Values.oidc.admin.ignoreRoles }}
|
||||||
|
- name: OIDC_IGNORE_ROLES
|
||||||
|
value: {{ .Values.oidc.admin.ignoreRoles | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.nodeSelector }}
|
||||||
|
nodeSelector:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.affinity }}
|
||||||
|
affinity:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.tolerations }}
|
||||||
|
tolerations:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
volumes:
|
||||||
|
- name: planka
|
||||||
|
{{- if .Values.persistence.enabled }}
|
||||||
|
persistentVolumeClaim:
|
||||||
|
claimName: {{ .Values.persistence.existingClaim | default (include "planka.fullname" .) }}
|
||||||
|
{{- else }}
|
||||||
|
emptyDir: {}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
{{- if .Values.autoscaling.enabled }}
|
||||||
|
apiVersion: autoscaling/v2beta1
|
||||||
|
kind: HorizontalPodAutoscaler
|
||||||
|
metadata:
|
||||||
|
name: {{ include "planka.fullname" . }}
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
scaleTargetRef:
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
name: {{ include "planka.fullname" . }}
|
||||||
|
minReplicas: {{ .Values.autoscaling.minReplicas }}
|
||||||
|
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
|
||||||
|
metrics:
|
||||||
|
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
|
||||||
|
- type: Resource
|
||||||
|
resource:
|
||||||
|
name: cpu
|
||||||
|
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
|
- type: Resource
|
||||||
|
resource:
|
||||||
|
name: memory
|
||||||
|
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
{{- if .Values.ingress.enabled -}}
|
||||||
|
{{- $fullName := include "planka.fullname" . -}}
|
||||||
|
{{- $svcPort := .Values.service.port -}}
|
||||||
|
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
|
||||||
|
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
|
||||||
|
{{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
|
{{- else -}}
|
||||||
|
apiVersion: extensions/v1beta1
|
||||||
|
{{- end }}
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: {{ $fullName }}
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
{{- with .Values.ingress.annotations }}
|
||||||
|
annotations:
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
|
spec:
|
||||||
|
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
|
||||||
|
ingressClassName: {{ .Values.ingress.className }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.ingress.tls }}
|
||||||
|
tls:
|
||||||
|
{{- range .Values.ingress.tls }}
|
||||||
|
- hosts:
|
||||||
|
{{- range .hosts }}
|
||||||
|
- {{ . | quote }}
|
||||||
|
{{- end }}
|
||||||
|
secretName: {{ .secretName }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
rules:
|
||||||
|
{{- range .Values.ingress.hosts }}
|
||||||
|
- host: {{ .host | quote }}
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
{{- range .paths }}
|
||||||
|
- path: {{ .path }}
|
||||||
|
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
|
||||||
|
pathType: {{ .pathType }}
|
||||||
|
{{- end }}
|
||||||
|
backend:
|
||||||
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
|
||||||
|
service:
|
||||||
|
name: {{ $fullName }}
|
||||||
|
port:
|
||||||
|
number: {{ $svcPort }}
|
||||||
|
{{- else }}
|
||||||
|
serviceName: {{ $fullName }}
|
||||||
|
servicePort: {{ $svcPort }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
|
||||||
|
---
|
||||||
|
kind: PersistentVolumeClaim
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: {{ include "planka.fullname" . }}
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: {{ include "planka.name" . }}
|
||||||
|
helm.sh/chart: {{ include "planka.chart" . }}
|
||||||
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
|
spec:
|
||||||
|
accessModes:
|
||||||
|
- {{ .Values.persistence.accessMode }}
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: {{ .Values.persistence.size | quote }}
|
||||||
|
{{- if .Values.persistence.storageClass }}
|
||||||
|
{{- if (eq "-" .Values.persistence.storageClass) }}
|
||||||
|
storageClassName: ""
|
||||||
|
{{- else }}
|
||||||
|
storageClassName: "{{ .Values.persistence.storageClass }}"
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{{- if .Values.oidc.enabled }}
|
||||||
|
{{- if eq (and (not (empty .Values.oidc.clientId)) (not (empty .Values.oidc.clientSecret))) (not (empty .Values.oidc.existingSecret)) -}}
|
||||||
|
{{- fail "Either specify inline `clientId` and `clientSecret` or refer to them via `existingSecret`" -}}
|
||||||
|
{{- end }}
|
||||||
|
{{- if (and (and (not (empty .Values.oidc.clientId)) (not (empty .Values.oidc.clientSecret))) (empty .Values.oidc.existingSecret)) -}}
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Secret
|
||||||
|
metadata:
|
||||||
|
name: {{ include "planka.fullname" . }}-oidc
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
type: Opaque
|
||||||
|
data:
|
||||||
|
clientId: {{ .Values.oidc.clientId | b64enc | quote }}
|
||||||
|
clientSecret: {{ .Values.oidc.clientSecret | b64enc | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: {{ include "planka.fullname" . }}
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
type: {{ .Values.service.type }}
|
||||||
|
ports:
|
||||||
|
- port: {{ .Values.service.port }}
|
||||||
|
targetPort: http
|
||||||
|
protocol: TCP
|
||||||
|
name: http
|
||||||
|
selector:
|
||||||
|
{{- include "planka.selectorLabels" . | nindent 4 }}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{{- if .Values.serviceAccount.create -}}
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ServiceAccount
|
||||||
|
metadata:
|
||||||
|
name: {{ include "planka.serviceAccountName" . }}
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
{{- with .Values.serviceAccount.annotations }}
|
||||||
|
annotations:
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Pod
|
||||||
|
metadata:
|
||||||
|
name: "{{ include "planka.fullname" . }}-test-connection"
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
annotations:
|
||||||
|
"helm.sh/hook": test
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: wget
|
||||||
|
image: busybox
|
||||||
|
command: ['wget']
|
||||||
|
args: ['{{ include "planka.fullname" . }}:{{ .Values.service.port }}']
|
||||||
|
restartPolicy: Never
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
# Default values for planka.
|
||||||
|
# This is a YAML-formatted file.
|
||||||
|
# Declare variables to be passed into your templates.
|
||||||
|
|
||||||
|
replicaCount: 1
|
||||||
|
|
||||||
|
image:
|
||||||
|
repository: ghcr.io/plankanban/planka
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
|
tag: ""
|
||||||
|
|
||||||
|
imagePullSecrets: []
|
||||||
|
nameOverride: ""
|
||||||
|
fullnameOverride: ""
|
||||||
|
|
||||||
|
# Generate a secret using openssl rand -base64 45
|
||||||
|
secretkey: ""
|
||||||
|
|
||||||
|
# Base url for Planka. Will override `ingress.hosts[0].host`
|
||||||
|
# Defaults to `http://localhost:3000` if ingress is disabled.
|
||||||
|
baseUrl: ""
|
||||||
|
|
||||||
|
serviceAccount:
|
||||||
|
# Specifies whether a service account should be created
|
||||||
|
create: true
|
||||||
|
# Annotations to add to the service account
|
||||||
|
annotations: {}
|
||||||
|
# The name of the service account to use.
|
||||||
|
# If not set and create is true, a name is generated using the fullname template
|
||||||
|
name: ""
|
||||||
|
|
||||||
|
podAnnotations: {}
|
||||||
|
|
||||||
|
podSecurityContext: {}
|
||||||
|
# fsGroup: 2000
|
||||||
|
|
||||||
|
securityContext: {}
|
||||||
|
# capabilities:
|
||||||
|
# drop:
|
||||||
|
# - ALL
|
||||||
|
# readOnlyRootFilesystem: true
|
||||||
|
# runAsNonRoot: true
|
||||||
|
# runAsUser: 1000
|
||||||
|
|
||||||
|
service:
|
||||||
|
type: ClusterIP
|
||||||
|
port: 1337
|
||||||
|
## @param service.containerPort Planka HTTP container port
|
||||||
|
## If empty will default to 1337
|
||||||
|
##
|
||||||
|
containerPort: 1337
|
||||||
|
|
||||||
|
ingress:
|
||||||
|
enabled: false
|
||||||
|
className: ""
|
||||||
|
annotations: {}
|
||||||
|
# kubernetes.io/ingress.class: nginx
|
||||||
|
# kubernetes.io/tls-acme: "true"
|
||||||
|
hosts:
|
||||||
|
# Used to set planka BASE_URL if no `baseurl` is provided.
|
||||||
|
- host: planka.local
|
||||||
|
paths:
|
||||||
|
- path: /
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
tls: []
|
||||||
|
# - secretName: planka-tls
|
||||||
|
# hosts:
|
||||||
|
# - planka.local
|
||||||
|
|
||||||
|
resources: {}
|
||||||
|
# We usually recommend not to specify default resources and to leave this as a conscious
|
||||||
|
# choice for the user. This also increases chances charts run on environments with little
|
||||||
|
# resources, such as Minikube. If you do want to specify resources, uncomment the following
|
||||||
|
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
|
||||||
|
# limits:
|
||||||
|
# cpu: 100m
|
||||||
|
# memory: 128Mi
|
||||||
|
# requests:
|
||||||
|
# cpu: 100m
|
||||||
|
# memory: 128Mi
|
||||||
|
|
||||||
|
autoscaling:
|
||||||
|
enabled: false
|
||||||
|
minReplicas: 1
|
||||||
|
maxReplicas: 100
|
||||||
|
targetCPUUtilizationPercentage: 80
|
||||||
|
# targetMemoryUtilizationPercentage: 80
|
||||||
|
|
||||||
|
nodeSelector: {}
|
||||||
|
|
||||||
|
tolerations: []
|
||||||
|
|
||||||
|
affinity: {}
|
||||||
|
|
||||||
|
postgresql:
|
||||||
|
enabled: true
|
||||||
|
auth:
|
||||||
|
database: planka
|
||||||
|
username: planka
|
||||||
|
password: ""
|
||||||
|
postgresPassword: ""
|
||||||
|
replicationPassword: ""
|
||||||
|
# existingSecret: planka-postgresql
|
||||||
|
serviceBindings:
|
||||||
|
enabled: true
|
||||||
|
|
||||||
|
## PVC-based data storage configuration
|
||||||
|
persistence:
|
||||||
|
enabled: false
|
||||||
|
# existingClaim: netbox-data
|
||||||
|
# storageClass: "-"
|
||||||
|
|
||||||
|
accessMode: ReadWriteOnce
|
||||||
|
size: 10Gi
|
||||||
|
|
||||||
|
## OpenID Identity Management configuration
|
||||||
|
##
|
||||||
|
## Example:
|
||||||
|
## ---------------
|
||||||
|
## oidc:
|
||||||
|
## enabled: true
|
||||||
|
## clientId: sxxaAIAxVXlCxTmc1YLHBbQr8NL8MqLI2DUbt42d
|
||||||
|
## clientSecret: om4RTMRVHRszU7bqxB7RZNkHIzA8e4sGYWxeCwIMYQXPwEBWe4SY5a0wwCe9ltB3zrq5f0dnFnp34cEHD7QSMHsKvV9AiV5Z7eqDraMnv0I8IFivmuV5wovAECAYreSI
|
||||||
|
## issuerUrl: https://auth.local/application/o/planka/
|
||||||
|
## admin:
|
||||||
|
## roles:
|
||||||
|
## - planka-admin
|
||||||
|
##
|
||||||
|
## ---------------
|
||||||
|
## NOTE: A minimal configuration requires setting `clientId`, `clientSecret` and `issuerUrl`. (plus `admin.roles` for administrators)
|
||||||
|
## ref: https://docs.planka.cloud/docs/Configuration/OIDC
|
||||||
|
##
|
||||||
|
oidc:
|
||||||
|
## @param oidc.enabled Enable single sign-on (SSO) with OpenID Connect (OIDC)
|
||||||
|
##
|
||||||
|
enabled: false
|
||||||
|
|
||||||
|
## OIDC credentials
|
||||||
|
## @param oidc.clientId A string unique to the provider that identifies your app.
|
||||||
|
## @param oidc.clientSecret A secret string that the provider uses to confirm ownership of a client ID.
|
||||||
|
##
|
||||||
|
## NOTE: Either specify inline `clientId` and `clientSecret` or refer to them via `existingSecret`
|
||||||
|
##
|
||||||
|
clientId: ""
|
||||||
|
clientSecret: ""
|
||||||
|
|
||||||
|
## @param oidc.existingSecret Name of an existing secret containing OIDC credentials
|
||||||
|
## NOTE: Must contain key `clientId` and `clientSecret`
|
||||||
|
## NOTE: When it's set, the `clientId` and `clientSecret` parameters are ignored
|
||||||
|
##
|
||||||
|
existingSecret: ""
|
||||||
|
|
||||||
|
## @param oidc.issuerUrl The OpenID connect metadata document endpoint
|
||||||
|
##
|
||||||
|
issuerUrl: ""
|
||||||
|
|
||||||
|
## @param oidc.scopes A list of scopes required for OIDC client.
|
||||||
|
## If empty will default to `openid`, `profile` and `email`
|
||||||
|
## NOTE: Planka needs the email and name claims
|
||||||
|
##
|
||||||
|
scopes: []
|
||||||
|
|
||||||
|
## Admin permissions configuration
|
||||||
|
admin:
|
||||||
|
## @param oidc.admin.ignoreRoles If set to true, the admin roles will be ignored.
|
||||||
|
## It is useful if you want to use OIDC for authentication but not for authorization.
|
||||||
|
## If empty will default to `false`
|
||||||
|
##
|
||||||
|
ignoreRoles: false
|
||||||
|
|
||||||
|
## @param oidc.admin.rolesAttribute The name of a custom group claim that you have configured in your OIDC provider
|
||||||
|
## If empty will default to `groups`
|
||||||
|
##
|
||||||
|
rolesAttribute: groups
|
||||||
|
|
||||||
|
## @param oidc.admin.roles The names of the admin groups
|
||||||
|
##
|
||||||
|
roles: []
|
||||||
|
# - planka-admin
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
REACT_APP_VERSION=1.10.2
|
REACT_APP_VERSION=1.16.1
|
||||||
|
|||||||
@@ -22,7 +22,9 @@ const replaceBaseUrl = (compiler) => {
|
|||||||
if (info.content.indexOf(BASE_URL_PLACEHOLDER) >= 0) {
|
if (info.content.indexOf(BASE_URL_PLACEHOLDER) >= 0) {
|
||||||
if (/\.css$/.exec(info.targetPath)) {
|
if (/\.css$/.exec(info.targetPath)) {
|
||||||
// For CSS 'url(...)' import we can use relative import
|
// For CSS 'url(...)' import we can use relative import
|
||||||
const relPath = path.relative(path.dirname(info.targetPath), info.outputPath);
|
const relPath = path
|
||||||
|
.relative(path.dirname(info.targetPath), info.outputPath)
|
||||||
|
.replace(/\\/g, '/');
|
||||||
replaceInFile(info.targetPath, BASE_URL_PLACEHOLDER, `${relPath}/`);
|
replaceInFile(info.targetPath, BASE_URL_PLACEHOLDER, `${relPath}/`);
|
||||||
} else if (/\.js$/.exec(info.targetPath)) {
|
} else if (/\.js$/.exec(info.targetPath)) {
|
||||||
// For JS 'import ... from "some-asset"' we can get the variable injected in the window object
|
// For JS 'import ... from "some-asset"' we can get the variable injected in the window object
|
||||||
|
|||||||
Generated
+3379
-21947
File diff suppressed because it is too large
Load Diff
+36
-29
@@ -49,65 +49,72 @@
|
|||||||
"**/*.test.js"
|
"**/*.test.js"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"prettier/prettier": [
|
||||||
|
"error",
|
||||||
|
{
|
||||||
|
"endOfLine": "auto"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@juggle/resize-observer": "^3.4.0",
|
"@juggle/resize-observer": "^3.4.0",
|
||||||
"classnames": "^2.3.2",
|
"classnames": "^2.3.2",
|
||||||
"date-fns": "^2.29.3",
|
"date-fns": "^2.30.0",
|
||||||
"dequal": "^2.0.3",
|
"dequal": "^2.0.3",
|
||||||
"easymde": "^2.18.0",
|
"easymde": "^2.18.0",
|
||||||
"history": "^5.3.0",
|
"history": "^5.3.0",
|
||||||
"i18next": "^22.0.6",
|
"i18next": "^23.7.6",
|
||||||
"i18next-browser-languagedetector": "^7.0.1",
|
"i18next-browser-languagedetector": "^7.2.0",
|
||||||
"initials": "^3.1.2",
|
"initials": "^3.1.2",
|
||||||
"js-cookie": "^3.0.1",
|
"js-cookie": "^3.0.5",
|
||||||
"jwt-decode": "^3.1.2",
|
"jwt-decode": "^4.0.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"node-sass": "^8.0.0",
|
"nanoid": "^5.0.3",
|
||||||
"photoswipe": "^5.3.3",
|
"node-sass": "^9.0.0",
|
||||||
|
"photoswipe": "^5.4.2",
|
||||||
"prop-types": "^15.8.1",
|
"prop-types": "^15.8.1",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-app-rewired": "^2.2.1",
|
"react-app-rewired": "^2.2.1",
|
||||||
"react-beautiful-dnd": "^13.1.1",
|
"react-beautiful-dnd": "^13.1.1",
|
||||||
"react-datepicker": "^4.8.0",
|
"react-datepicker": "^4.21.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-dropzone": "^14.2.3",
|
"react-dropzone": "^14.2.3",
|
||||||
"react-i18next": "^12.0.0",
|
"react-i18next": "^13.5.0",
|
||||||
"react-input-mask": "^2.0.4",
|
"react-input-mask": "^2.0.4",
|
||||||
"react-markdown": "^8.0.3",
|
"react-markdown": "^8.0.7",
|
||||||
"react-photoswipe-gallery": "^2.2.2",
|
"react-photoswipe-gallery": "^2.2.7",
|
||||||
"react-redux": "^8.0.5",
|
"react-redux": "^8.1.3",
|
||||||
"react-router-dom": "^6.4.3",
|
"react-router-dom": "^6.19.0",
|
||||||
"react-scripts": "5.0.1",
|
"react-scripts": "5.0.1",
|
||||||
"react-simplemde-editor": "^5.2.0",
|
"react-simplemde-editor": "^5.2.0",
|
||||||
"react-textarea-autosize": "^8.4.0",
|
"react-textarea-autosize": "^8.5.3",
|
||||||
"redux": "^4.2.0",
|
"redux": "^4.2.1",
|
||||||
"redux-logger": "^3.0.6",
|
"redux-logger": "^3.0.6",
|
||||||
"redux-orm": "^0.16.2",
|
"redux-orm": "^0.16.2",
|
||||||
"redux-saga": "^1.2.1",
|
"redux-saga": "^1.2.3",
|
||||||
"remark-breaks": "^3.0.2",
|
"remark-breaks": "^4.0.0",
|
||||||
"remark-gfm": "^3.0.1",
|
"remark-gfm": "^3.0.1",
|
||||||
"reselect": "^4.1.7",
|
"reselect": "^4.1.8",
|
||||||
"sails.io.js": "^1.2.1",
|
"sails.io.js": "^1.2.1",
|
||||||
"semantic-ui-react": "^2.1.3",
|
"semantic-ui-react": "^2.1.4",
|
||||||
"socket.io-client": "^2.5.0",
|
"socket.io-client": "^2.5.0",
|
||||||
"validator": "^13.7.0",
|
"validator": "^13.11.0",
|
||||||
"whatwg-fetch": "^3.6.2",
|
"whatwg-fetch": "^3.6.19",
|
||||||
"zxcvbn": "^4.4.2"
|
"zxcvbn": "^4.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@testing-library/jest-dom": "^5.16.5",
|
"@testing-library/jest-dom": "^6.1.4",
|
||||||
"@testing-library/react": "^13.4.0",
|
"@testing-library/react": "^14.1.0",
|
||||||
"@testing-library/user-event": "^13.5.0",
|
"@testing-library/user-event": "^14.5.1",
|
||||||
"babel-preset-airbnb": "^5.0.0",
|
"babel-preset-airbnb": "^5.0.0",
|
||||||
"chai": "^4.3.7",
|
"chai": "^4.3.10",
|
||||||
"eslint": "^8.28.0",
|
"eslint": "^8.53.0",
|
||||||
"eslint-config-airbnb": "^19.0.4",
|
"eslint-config-airbnb": "^19.0.4",
|
||||||
"eslint-plugin-import": "^2.26.0",
|
"eslint-plugin-import": "^2.29.0",
|
||||||
"eslint-plugin-jsx-a11y": "^6.6.1",
|
"eslint-plugin-jsx-a11y": "^6.8.0",
|
||||||
"eslint-plugin-react": "^7.31.11",
|
"eslint-plugin-react": "^7.33.2",
|
||||||
"eslint-plugin-react-hooks": "^4.6.0",
|
"eslint-plugin-react-hooks": "^4.6.0",
|
||||||
"react-test-renderer": "^18.2.0"
|
"react-test-renderer": "^18.2.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,6 +39,14 @@ const initializeCore = (
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// TODO: with success?
|
||||||
|
initializeCore.fetchConfig = (config) => ({
|
||||||
|
type: ActionTypes.CORE_INITIALIZE__CONFIG_FETCH,
|
||||||
|
payload: {
|
||||||
|
config,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const logout = () => ({
|
const logout = () => ({
|
||||||
type: ActionTypes.LOGOUT,
|
type: ActionTypes.LOGOUT,
|
||||||
payload: {},
|
payload: {},
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
import ActionTypes from '../constants/ActionTypes';
|
import ActionTypes from '../constants/ActionTypes';
|
||||||
|
|
||||||
|
const initializeLogin = (config) => ({
|
||||||
|
type: ActionTypes.LOGIN_INITIALIZE,
|
||||||
|
payload: {
|
||||||
|
config,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const authenticate = (data) => ({
|
const authenticate = (data) => ({
|
||||||
type: ActionTypes.AUTHENTICATE,
|
type: ActionTypes.AUTHENTICATE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -21,12 +28,33 @@ authenticate.failure = (error) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const authenticateUsingOidc = () => ({
|
||||||
|
type: ActionTypes.USING_OIDC_AUTHENTICATE,
|
||||||
|
payload: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
authenticateUsingOidc.success = (accessToken) => ({
|
||||||
|
type: ActionTypes.USING_OIDC_AUTHENTICATE__SUCCESS,
|
||||||
|
payload: {
|
||||||
|
accessToken,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
authenticateUsingOidc.failure = (error) => ({
|
||||||
|
type: ActionTypes.USING_OIDC_AUTHENTICATE__FAILURE,
|
||||||
|
payload: {
|
||||||
|
error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const clearAuthenticateError = () => ({
|
const clearAuthenticateError = () => ({
|
||||||
type: ActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
type: ActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
||||||
payload: {},
|
payload: {},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
initializeLogin,
|
||||||
authenticate,
|
authenticate,
|
||||||
|
authenticateUsingOidc,
|
||||||
clearAuthenticateError,
|
clearAuthenticateError,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,10 +5,14 @@ import socket from './socket';
|
|||||||
|
|
||||||
const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
|
const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
|
||||||
|
|
||||||
|
const exchangeForAccessTokenUsingOidc = (data, headers) =>
|
||||||
|
http.post('/access-tokens/exchange-using-oidc', data, headers);
|
||||||
|
|
||||||
const deleteCurrentAccessToken = (headers) =>
|
const deleteCurrentAccessToken = (headers) =>
|
||||||
socket.delete('/access-tokens/me', undefined, headers);
|
socket.delete('/access-tokens/me', undefined, headers);
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createAccessToken,
|
createAccessToken,
|
||||||
|
exchangeForAccessTokenUsingOidc,
|
||||||
deleteCurrentAccessToken,
|
deleteCurrentAccessToken,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
import { transformUser } from './users';
|
||||||
|
|
||||||
/* Transformers */
|
/* Transformers */
|
||||||
|
|
||||||
@@ -13,6 +14,10 @@ const getActivities = (cardId, data, headers) =>
|
|||||||
socket.get(`/cards/${cardId}/actions`, data, headers).then((body) => ({
|
socket.get(`/cards/${cardId}/actions`, data, headers).then((body) => ({
|
||||||
...body,
|
...body,
|
||||||
items: body.items.map(transformActivity),
|
items: body.items.map(transformActivity),
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
users: body.included.users.map(transformUser),
|
||||||
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
/* Event handlers */
|
/* Event handlers */
|
||||||
|
|||||||
@@ -1,18 +1,50 @@
|
|||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
|
||||||
|
/* Transformers */
|
||||||
|
|
||||||
|
export const transformBoardMembership = (boardMembership) => ({
|
||||||
|
...boardMembership,
|
||||||
|
createdAt: new Date(boardMembership.createdAt),
|
||||||
|
});
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
const createBoardMembership = (boardId, data, headers) =>
|
const createBoardMembership = (boardId, data, headers) =>
|
||||||
socket.post(`/boards/${boardId}/memberships`, data, headers);
|
socket.post(`/boards/${boardId}/memberships`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformBoardMembership(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const updateBoardMembership = (id, data, headers) =>
|
const updateBoardMembership = (id, data, headers) =>
|
||||||
socket.patch(`/board-memberships/${id}`, data, headers);
|
socket.patch(`/board-memberships/${id}`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformBoardMembership(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const deleteBoardMembership = (id, headers) =>
|
const deleteBoardMembership = (id, headers) =>
|
||||||
socket.delete(`/board-memberships/${id}`, undefined, headers);
|
socket.delete(`/board-memberships/${id}`, undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformBoardMembership(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
|
/* Event handlers */
|
||||||
|
|
||||||
|
const makeHandleBoardMembershipCreate = (next) => (body) => {
|
||||||
|
next({
|
||||||
|
...body,
|
||||||
|
item: transformBoardMembership(body.item),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const makeHandleBoardMembershipUpdate = makeHandleBoardMembershipCreate;
|
||||||
|
|
||||||
|
const makeHandleBoardMembershipDelete = makeHandleBoardMembershipCreate;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createBoardMembership,
|
createBoardMembership,
|
||||||
updateBoardMembership,
|
updateBoardMembership,
|
||||||
deleteBoardMembership,
|
deleteBoardMembership,
|
||||||
|
makeHandleBoardMembershipCreate,
|
||||||
|
makeHandleBoardMembershipUpdate,
|
||||||
|
makeHandleBoardMembershipDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,12 +1,20 @@
|
|||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
import http from './http';
|
import http from './http';
|
||||||
|
import { transformUser } from './users';
|
||||||
|
import { transformBoardMembership } from './board-memberships';
|
||||||
import { transformCard } from './cards';
|
import { transformCard } from './cards';
|
||||||
import { transformAttachment } from './attachments';
|
import { transformAttachment } from './attachments';
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
const createBoard = (projectId, data, headers) =>
|
const createBoard = (projectId, data, headers) =>
|
||||||
socket.post(`/projects/${projectId}/boards`, data, headers);
|
socket.post(`/projects/${projectId}/boards`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
const createBoardWithImport = (projectId, data, requestId, headers) =>
|
const createBoardWithImport = (projectId, data, requestId, headers) =>
|
||||||
http.post(`/projects/${projectId}/boards?requestId=${requestId}`, data, headers);
|
http.post(`/projects/${projectId}/boards?requestId=${requestId}`, data, headers);
|
||||||
@@ -18,6 +26,8 @@ const getBoard = (id, subscribe, headers) =>
|
|||||||
...body,
|
...body,
|
||||||
included: {
|
included: {
|
||||||
...body.included,
|
...body.included,
|
||||||
|
users: body.included.users.map(transformUser),
|
||||||
|
boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
|
||||||
cards: body.included.cards.map(transformCard),
|
cards: body.included.cards.map(transformCard),
|
||||||
attachments: body.included.attachments.map(transformAttachment),
|
attachments: body.included.attachments.map(transformAttachment),
|
||||||
},
|
},
|
||||||
|
|||||||
+10
-10
@@ -8,11 +8,11 @@ export const transformCard = (card) => ({
|
|||||||
...(card.dueDate && {
|
...(card.dueDate && {
|
||||||
dueDate: new Date(card.dueDate),
|
dueDate: new Date(card.dueDate),
|
||||||
}),
|
}),
|
||||||
...(card.timer && {
|
...(card.stopwatch && {
|
||||||
timer: {
|
stopwatch: {
|
||||||
...card.timer,
|
...card.stopwatch,
|
||||||
...(card.timer.startedAt && {
|
...(card.stopwatch.startedAt && {
|
||||||
startedAt: new Date(card.timer.startedAt),
|
startedAt: new Date(card.stopwatch.startedAt),
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
@@ -23,11 +23,11 @@ export const transformCardData = (data) => ({
|
|||||||
...(data.dueDate && {
|
...(data.dueDate && {
|
||||||
dueDate: data.dueDate.toISOString(),
|
dueDate: data.dueDate.toISOString(),
|
||||||
}),
|
}),
|
||||||
...(data.timer && {
|
...(data.stopwatch && {
|
||||||
timer: {
|
stopwatch: {
|
||||||
...data.timer,
|
...data.stopwatch,
|
||||||
...(data.timer.startedAt && {
|
...(data.stopwatch.startedAt && {
|
||||||
startedAt: data.timer.startedAt.toISOString(),
|
startedAt: data.stopwatch.startedAt.toISOString(),
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -5,13 +5,15 @@ import Config from '../constants/Config';
|
|||||||
const http = {};
|
const http = {};
|
||||||
|
|
||||||
// TODO: add all methods
|
// TODO: add all methods
|
||||||
['POST'].forEach((method) => {
|
['GET', 'POST'].forEach((method) => {
|
||||||
http[method.toLowerCase()] = (url, data, headers) => {
|
http[method.toLowerCase()] = (url, data, headers) => {
|
||||||
const formData = Object.keys(data).reduce((result, key) => {
|
const formData =
|
||||||
result.append(key, data[key]);
|
data &&
|
||||||
|
Object.keys(data).reduce((result, key) => {
|
||||||
|
result.append(key, data[key]);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}, new FormData());
|
}, new FormData());
|
||||||
|
|
||||||
return fetch(`${Config.SERVER_BASE_URL}/api${url}`, {
|
return fetch(`${Config.SERVER_BASE_URL}/api${url}`, {
|
||||||
method,
|
method,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import http from './http';
|
import http from './http';
|
||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
import root from './root';
|
||||||
import accessTokens from './access-tokens';
|
import accessTokens from './access-tokens';
|
||||||
import users from './users';
|
import users from './users';
|
||||||
import projects from './projects';
|
import projects from './projects';
|
||||||
@@ -20,6 +21,7 @@ import notifications from './notifications';
|
|||||||
export { http, socket };
|
export { http, socket };
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
...root,
|
||||||
...accessTokens,
|
...accessTokens,
|
||||||
...users,
|
...users,
|
||||||
...projects,
|
...projects,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import omit from 'lodash/omit';
|
import omit from 'lodash/omit';
|
||||||
|
|
||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
import { transformUser } from './users';
|
||||||
import { transformCard } from './cards';
|
import { transformCard } from './cards';
|
||||||
import { transformActivity } from './activities';
|
import { transformActivity } from './activities';
|
||||||
|
|
||||||
@@ -19,6 +20,7 @@ const getNotifications = (headers) =>
|
|||||||
items: body.items.map(transformNotification),
|
items: body.items.map(transformNotification),
|
||||||
included: {
|
included: {
|
||||||
...omit(body.included, 'actions'),
|
...omit(body.included, 'actions'),
|
||||||
|
users: body.included.users.map(transformUser),
|
||||||
cards: body.included.cards.map(transformCard),
|
cards: body.included.cards.map(transformCard),
|
||||||
activities: body.included.actions.map(transformActivity),
|
activities: body.included.actions.map(transformActivity),
|
||||||
},
|
},
|
||||||
@@ -30,6 +32,7 @@ const getNotification = (id, headers) =>
|
|||||||
item: transformNotification(body.item),
|
item: transformNotification(body.item),
|
||||||
included: {
|
included: {
|
||||||
...omit(body.included, 'actions'),
|
...omit(body.included, 'actions'),
|
||||||
|
users: body.included.users.map(transformUser),
|
||||||
cards: body.included.cards.map(transformCard),
|
cards: body.included.cards.map(transformCard),
|
||||||
activities: body.included.actions.map(transformActivity),
|
activities: body.included.actions.map(transformActivity),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,14 +1,40 @@
|
|||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
|
||||||
|
/* Transformers */
|
||||||
|
|
||||||
|
export const transformProjectManager = (projectManager) => ({
|
||||||
|
...projectManager,
|
||||||
|
createdAt: new Date(projectManager.createdAt),
|
||||||
|
});
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
const createProjectManager = (projectId, data, headers) =>
|
const createProjectManager = (projectId, data, headers) =>
|
||||||
socket.post(`/projects/${projectId}/managers`, data, headers);
|
socket.post(`/projects/${projectId}/managers`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformProjectManager(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const deleteProjectManager = (id, headers) =>
|
const deleteProjectManager = (id, headers) =>
|
||||||
socket.delete(`/project-managers/${id}`, undefined, headers);
|
socket.delete(`/project-managers/${id}`, undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformProjectManager(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
|
/* Event handlers */
|
||||||
|
|
||||||
|
const makeHandleProjectManagerCreate = (next) => (body) => {
|
||||||
|
next({
|
||||||
|
...body,
|
||||||
|
item: transformProjectManager(body.item),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const makeHandleProjectManagerDelete = makeHandleProjectManagerCreate;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createProjectManager,
|
createProjectManager,
|
||||||
deleteProjectManager,
|
deleteProjectManager,
|
||||||
|
makeHandleProjectManagerCreate,
|
||||||
|
makeHandleProjectManagerDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,13 +1,41 @@
|
|||||||
import http from './http';
|
import http from './http';
|
||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
import { transformUser } from './users';
|
||||||
|
import { transformProjectManager } from './project-managers';
|
||||||
|
import { transformBoardMembership } from './board-memberships';
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
const getProjects = (headers) => socket.get('/projects', undefined, headers);
|
const getProjects = (headers) =>
|
||||||
|
socket.get('/projects', undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
users: body.included.users.map(transformUser),
|
||||||
|
projectManagers: body.included.projectManagers.map(transformProjectManager),
|
||||||
|
boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
const createProject = (data, headers) => socket.post('/projects', data, headers);
|
const createProject = (data, headers) =>
|
||||||
|
socket.post('/projects', data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
projectManagers: body.included.projectManagers.map(transformProjectManager),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
const getProject = (id, headers) => socket.get(`/projects/${id}`, undefined, headers);
|
const getProject = (id, headers) =>
|
||||||
|
socket.get(`/projects/${id}`, undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
users: body.included.users.map(transformUser),
|
||||||
|
projectManagers: body.included.projectManagers.map(transformProjectManager),
|
||||||
|
boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
const updateProject = (id, data, headers) => socket.patch(`/projects/${id}`, data, headers);
|
const updateProject = (id, data, headers) => socket.patch(`/projects/${id}`, data, headers);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import http from './http';
|
||||||
|
|
||||||
|
/* Actions */
|
||||||
|
|
||||||
|
const getConfig = (headers) => http.get('/config', undefined, headers);
|
||||||
|
|
||||||
|
export default {
|
||||||
|
getConfig,
|
||||||
|
};
|
||||||
+70
-10
@@ -1,30 +1,87 @@
|
|||||||
import http from './http';
|
import http from './http';
|
||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
|
||||||
|
/* Transformers */
|
||||||
|
|
||||||
|
export const transformUser = (user) => ({
|
||||||
|
...user,
|
||||||
|
createdAt: new Date(user.createdAt),
|
||||||
|
});
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
const getUsers = (headers) => socket.get('/users', undefined, headers);
|
const getUsers = (headers) =>
|
||||||
|
socket.get('/users', undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
items: body.items.map(transformUser),
|
||||||
|
}));
|
||||||
|
|
||||||
const createUser = (data, headers) => socket.post('/users', data, headers);
|
const createUser = (data, headers) =>
|
||||||
|
socket.post('/users', data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const getUser = (id, headers) => socket.get(`/users/${id}`, undefined, headers);
|
const getUser = (id, headers) =>
|
||||||
|
socket.get(`/users/${id}`, undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const getCurrentUser = (subscribe, headers) =>
|
const getCurrentUser = (subscribe, headers) =>
|
||||||
socket.get(`/users/me${subscribe ? '?subscribe=true' : ''}`, undefined, headers);
|
socket.get(`/users/me${subscribe ? '?subscribe=true' : ''}`, undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const updateUser = (id, data, headers) => socket.patch(`/users/${id}`, data, headers);
|
const updateUser = (id, data, headers) =>
|
||||||
|
socket.patch(`/users/${id}`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const updateUserEmail = (id, data, headers) => socket.patch(`/users/${id}/email`, data, headers);
|
const updateUserEmail = (id, data, headers) =>
|
||||||
|
socket.patch(`/users/${id}/email`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const updateUserPassword = (id, data, headers) =>
|
const updateUserPassword = (id, data, headers) =>
|
||||||
socket.patch(`/users/${id}/password`, data, headers);
|
socket.patch(`/users/${id}/password`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const updateUserUsername = (id, data, headers) =>
|
const updateUserUsername = (id, data, headers) =>
|
||||||
socket.patch(`/users/${id}/username`, data, headers);
|
socket.patch(`/users/${id}/username`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const updateUserAvatar = (id, data, headers) => http.post(`/users/${id}/avatar`, data, headers);
|
const updateUserAvatar = (id, data, headers) =>
|
||||||
|
http.post(`/users/${id}/avatar`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const deleteUser = (id, headers) => socket.delete(`/users/${id}`, undefined, headers);
|
const deleteUser = (id, headers) =>
|
||||||
|
socket.delete(`/users/${id}`, undefined, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
|
/* Event handlers */
|
||||||
|
|
||||||
|
const makeHandleUserCreate = (next) => (body) => {
|
||||||
|
next({
|
||||||
|
...body,
|
||||||
|
item: transformUser(body.item),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const makeHandleUserUpdate = makeHandleUserCreate;
|
||||||
|
|
||||||
|
const makeHandleUserDelete = makeHandleUserCreate;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
getUsers,
|
getUsers,
|
||||||
@@ -37,4 +94,7 @@ export default {
|
|||||||
updateUserUsername,
|
updateUserUsername,
|
||||||
updateUserAvatar,
|
updateUserAvatar,
|
||||||
deleteUser,
|
deleteUser,
|
||||||
|
makeHandleUserCreate,
|
||||||
|
makeHandleUserUpdate,
|
||||||
|
makeHandleUserDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -62,6 +62,11 @@ const Board = React.memo(
|
|||||||
|
|
||||||
const handleMouseDown = useCallback(
|
const handleMouseDown = useCallback(
|
||||||
(event) => {
|
(event) => {
|
||||||
|
// If button is defined and not equal to 0 (left click)
|
||||||
|
if (event.button) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.target !== wrapper.current && !event.target.dataset.dragScroller) {
|
if (event.target !== wrapper.current && !event.target.dataset.dragScroller) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
|
|||||||
@@ -85,7 +85,6 @@
|
|||||||
height: 56px;
|
height: 56px;
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
height: 38px;
|
height: 38px;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { useSteps } from '../../hooks';
|
|||||||
import BoardMembershipsStep from '../BoardMembershipsStep';
|
import BoardMembershipsStep from '../BoardMembershipsStep';
|
||||||
import LabelsStep from '../LabelsStep';
|
import LabelsStep from '../LabelsStep';
|
||||||
import DueDateEditStep from '../DueDateEditStep';
|
import DueDateEditStep from '../DueDateEditStep';
|
||||||
import TimerEditStep from '../TimerEditStep';
|
import StopwatchEditStep from '../StopwatchEditStep';
|
||||||
import CardMoveStep from '../CardMoveStep';
|
import CardMoveStep from '../CardMoveStep';
|
||||||
import DeleteStep from '../DeleteStep';
|
import DeleteStep from '../DeleteStep';
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ const StepTypes = {
|
|||||||
USERS: 'USERS',
|
USERS: 'USERS',
|
||||||
LABELS: 'LABELS',
|
LABELS: 'LABELS',
|
||||||
EDIT_DUE_DATE: 'EDIT_DUE_DATE',
|
EDIT_DUE_DATE: 'EDIT_DUE_DATE',
|
||||||
EDIT_TIMER: 'EDIT_TIMER',
|
EDIT_STOPWATCH: 'EDIT_STOPWATCH',
|
||||||
MOVE: 'MOVE',
|
MOVE: 'MOVE',
|
||||||
DELETE: 'DELETE',
|
DELETE: 'DELETE',
|
||||||
};
|
};
|
||||||
@@ -68,8 +68,8 @@ const ActionsStep = React.memo(
|
|||||||
openStep(StepTypes.EDIT_DUE_DATE);
|
openStep(StepTypes.EDIT_DUE_DATE);
|
||||||
}, [openStep]);
|
}, [openStep]);
|
||||||
|
|
||||||
const handleEditTimerClick = useCallback(() => {
|
const handleEditStopwatchClick = useCallback(() => {
|
||||||
openStep(StepTypes.EDIT_TIMER);
|
openStep(StepTypes.EDIT_STOPWATCH);
|
||||||
}, [openStep]);
|
}, [openStep]);
|
||||||
|
|
||||||
const handleMoveClick = useCallback(() => {
|
const handleMoveClick = useCallback(() => {
|
||||||
@@ -89,10 +89,10 @@ const ActionsStep = React.memo(
|
|||||||
[onUpdate],
|
[onUpdate],
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleTimerUpdate = useCallback(
|
const handleStopwatchUpdate = useCallback(
|
||||||
(timer) => {
|
(stopwatch) => {
|
||||||
onUpdate({
|
onUpdate({
|
||||||
timer,
|
stopwatch,
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
[onUpdate],
|
[onUpdate],
|
||||||
@@ -133,11 +133,11 @@ const ActionsStep = React.memo(
|
|||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
case StepTypes.EDIT_TIMER:
|
case StepTypes.EDIT_STOPWATCH:
|
||||||
return (
|
return (
|
||||||
<TimerEditStep
|
<StopwatchEditStep
|
||||||
defaultValue={card.timer}
|
defaultValue={card.stopwatch}
|
||||||
onUpdate={handleTimerUpdate}
|
onUpdate={handleStopwatchUpdate}
|
||||||
onBack={handleBack}
|
onBack={handleBack}
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
/>
|
/>
|
||||||
@@ -197,8 +197,8 @@ const ActionsStep = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditTimerClick}>
|
<Menu.Item className={styles.menuItem} onClick={handleEditStopwatchClick}>
|
||||||
{t('action.editTimer', {
|
{t('action.editStopwatch', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
|
|||||||
import { Draggable } from 'react-beautiful-dnd';
|
import { Draggable } from 'react-beautiful-dnd';
|
||||||
import { usePopup } from '../../lib/popup';
|
import { usePopup } from '../../lib/popup';
|
||||||
|
|
||||||
import { startTimer, stopTimer } from '../../utils/timer';
|
import { startStopwatch, stopStopwatch } from '../../utils/stopwatch';
|
||||||
import Paths from '../../constants/Paths';
|
import Paths from '../../constants/Paths';
|
||||||
import Tasks from './Tasks';
|
import Tasks from './Tasks';
|
||||||
import NameEdit from './NameEdit';
|
import NameEdit from './NameEdit';
|
||||||
@@ -14,7 +14,7 @@ import ActionsStep from './ActionsStep';
|
|||||||
import User from '../User';
|
import User from '../User';
|
||||||
import Label from '../Label';
|
import Label from '../Label';
|
||||||
import DueDate from '../DueDate';
|
import DueDate from '../DueDate';
|
||||||
import Timer from '../Timer';
|
import Stopwatch from '../Stopwatch';
|
||||||
|
|
||||||
import styles from './Card.module.scss';
|
import styles from './Card.module.scss';
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ const Card = React.memo(
|
|||||||
index,
|
index,
|
||||||
name,
|
name,
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
stopwatch,
|
||||||
coverUrl,
|
coverUrl,
|
||||||
boardId,
|
boardId,
|
||||||
listId,
|
listId,
|
||||||
@@ -60,15 +60,15 @@ const Card = React.memo(
|
|||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleToggleTimerClick = useCallback(
|
const handleToggleStopwatchClick = useCallback(
|
||||||
(event) => {
|
(event) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
onUpdate({
|
onUpdate({
|
||||||
timer: timer.startedAt ? stopTimer(timer) : startTimer(timer),
|
stopwatch: stopwatch.startedAt ? stopStopwatch(stopwatch) : startStopwatch(stopwatch),
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
[timer, onUpdate],
|
[stopwatch, onUpdate],
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleNameUpdate = useCallback(
|
const handleNameUpdate = useCallback(
|
||||||
@@ -104,7 +104,7 @@ const Card = React.memo(
|
|||||||
)}
|
)}
|
||||||
<div className={styles.name}>{name}</div>
|
<div className={styles.name}>{name}</div>
|
||||||
{tasks.length > 0 && <Tasks items={tasks} />}
|
{tasks.length > 0 && <Tasks items={tasks} />}
|
||||||
{(dueDate || timer || notificationsTotal > 0) && (
|
{(dueDate || stopwatch || notificationsTotal > 0) && (
|
||||||
<span className={styles.attachments}>
|
<span className={styles.attachments}>
|
||||||
{notificationsTotal > 0 && (
|
{notificationsTotal > 0 && (
|
||||||
<span
|
<span
|
||||||
@@ -122,14 +122,14 @@ const Card = React.memo(
|
|||||||
<DueDate value={dueDate} size="tiny" />
|
<DueDate value={dueDate} size="tiny" />
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{timer && (
|
{stopwatch && (
|
||||||
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
||||||
<Timer
|
<Stopwatch
|
||||||
as="span"
|
as="span"
|
||||||
startedAt={timer.startedAt}
|
startedAt={stopwatch.startedAt}
|
||||||
total={timer.total}
|
total={stopwatch.total}
|
||||||
size="tiny"
|
size="tiny"
|
||||||
onClick={canEdit ? handleToggleTimerClick : undefined}
|
onClick={canEdit ? handleToggleStopwatchClick : undefined}
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -171,7 +171,7 @@ const Card = React.memo(
|
|||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
card={{
|
card={{
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
stopwatch,
|
||||||
boardId,
|
boardId,
|
||||||
listId,
|
listId,
|
||||||
projectId,
|
projectId,
|
||||||
@@ -219,7 +219,7 @@ Card.propTypes = {
|
|||||||
index: PropTypes.number.isRequired,
|
index: PropTypes.number.isRequired,
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
dueDate: PropTypes.instanceOf(Date),
|
dueDate: PropTypes.instanceOf(Date),
|
||||||
timer: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
coverUrl: PropTypes.string,
|
coverUrl: PropTypes.string,
|
||||||
boardId: PropTypes.string.isRequired,
|
boardId: PropTypes.string.isRequired,
|
||||||
listId: PropTypes.string.isRequired,
|
listId: PropTypes.string.isRequired,
|
||||||
@@ -252,7 +252,7 @@ Card.propTypes = {
|
|||||||
|
|
||||||
Card.defaultProps = {
|
Card.defaultProps = {
|
||||||
dueDate: undefined,
|
dueDate: undefined,
|
||||||
timer: undefined,
|
stopwatch: undefined,
|
||||||
coverUrl: undefined,
|
coverUrl: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import TextareaAutosize from 'react-textarea-autosize';
|
import TextareaAutosize from 'react-textarea-autosize';
|
||||||
import { Button, Form, TextArea } from 'semantic-ui-react';
|
import { Button, Form, TextArea } from 'semantic-ui-react';
|
||||||
|
|
||||||
import { useClosableForm, useForm } from '../../../hooks';
|
import { useForm } from '../../../hooks';
|
||||||
|
|
||||||
import styles from './CommentEdit.module.scss';
|
import styles from './CommentEdit.module.scss';
|
||||||
|
|
||||||
@@ -35,12 +35,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
|
|||||||
text: data.text.trim(),
|
text: data.text.trim(),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!cleanData.text) {
|
if (cleanData.text && !dequal(cleanData, defaultData)) {
|
||||||
textField.current.ref.current.select();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dequal(cleanData, defaultData)) {
|
|
||||||
onUpdate(cleanData);
|
onUpdate(cleanData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,10 +60,9 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
|
|||||||
[submit],
|
[submit],
|
||||||
);
|
);
|
||||||
|
|
||||||
const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
|
const handleFieldBlur = useCallback(() => {
|
||||||
close,
|
submit();
|
||||||
isOpened,
|
}, [submit]);
|
||||||
);
|
|
||||||
|
|
||||||
const handleSubmit = useCallback(() => {
|
const handleSubmit = useCallback(() => {
|
||||||
submit();
|
submit();
|
||||||
@@ -99,13 +93,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
|
|||||||
onBlur={handleFieldBlur}
|
onBlur={handleFieldBlur}
|
||||||
/>
|
/>
|
||||||
<div className={styles.controls}>
|
<div className={styles.controls}>
|
||||||
{/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
|
<Button positive content={t('action.save')} />
|
||||||
<Button
|
|
||||||
positive
|
|
||||||
content={t('action.save')}
|
|
||||||
onMouseOver={handleControlMouseOver}
|
|
||||||
onMouseOut={handleControlMouseOut}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import classNames from 'classnames';
|
|||||||
import { useTranslation, Trans } from 'react-i18next';
|
import { useTranslation, Trans } from 'react-i18next';
|
||||||
import { Comment } from 'semantic-ui-react';
|
import { Comment } from 'semantic-ui-react';
|
||||||
|
|
||||||
|
import getDateFormat from '../../../utils/get-date-format';
|
||||||
import { ActivityTypes } from '../../../constants/Enums';
|
import { ActivityTypes } from '../../../constants/Enums';
|
||||||
import ItemComment from './ItemComment';
|
import ItemComment from './ItemComment';
|
||||||
import User from '../../User';
|
import User from '../../User';
|
||||||
@@ -66,7 +67,7 @@ const Item = React.memo(({ type, data, createdAt, user }) => {
|
|||||||
<div className={classNames(styles.content)}>
|
<div className={classNames(styles.content)}>
|
||||||
<div>{contentNode}</div>
|
<div>{contentNode}</div>
|
||||||
<span className={styles.date}>
|
<span className={styles.date}>
|
||||||
{t('format:longDateTime', {
|
{t(`format:${getDateFormat(createdAt)}`, {
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
value: createdAt,
|
value: createdAt,
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { Comment } from 'semantic-ui-react';
|
|||||||
import { usePopup } from '../../../lib/popup';
|
import { usePopup } from '../../../lib/popup';
|
||||||
import { Markdown } from '../../../lib/custom-ui';
|
import { Markdown } from '../../../lib/custom-ui';
|
||||||
|
|
||||||
|
import getDateFormat from '../../../utils/get-date-format';
|
||||||
import CommentEdit from './CommentEdit';
|
import CommentEdit from './CommentEdit';
|
||||||
import User from '../../User';
|
import User from '../../User';
|
||||||
import DeleteStep from '../../DeleteStep';
|
import DeleteStep from '../../DeleteStep';
|
||||||
@@ -33,7 +34,7 @@ const ItemComment = React.memo(
|
|||||||
<div className={styles.title}>
|
<div className={styles.title}>
|
||||||
<span className={styles.author}>{user.name}</span>
|
<span className={styles.author}>{user.name}</span>
|
||||||
<span className={styles.date}>
|
<span className={styles.date}>
|
||||||
{t('format:longDateTime', {
|
{t(`format:${getDateFormat(createdAt)}`, {
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
value: createdAt,
|
value: createdAt,
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ const AttachmentAddZone = React.memo(({ children, onCreate }) => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
||||||
<div {...getRootProps()} className={styles.wrapper}>
|
<div {...getRootProps()}>
|
||||||
{isDragActive && <div className={styles.dropzone}>{t('common.dropFileToUpload')}</div>}
|
{isDragActive && <div className={styles.dropzone}>{t('common.dropFileToUpload')}</div>}
|
||||||
{children}
|
{children}
|
||||||
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
||||||
|
|||||||
@@ -12,8 +12,4 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
z-index: 2001;
|
z-index: 2001;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wrapper {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { Button, Grid, Icon, Modal } from 'semantic-ui-react';
|
|||||||
import { usePopup } from '../../lib/popup';
|
import { usePopup } from '../../lib/popup';
|
||||||
import { Markdown } from '../../lib/custom-ui';
|
import { Markdown } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { startTimer, stopTimer } from '../../utils/timer';
|
import { startStopwatch, stopStopwatch } from '../../utils/stopwatch';
|
||||||
import NameField from './NameField';
|
import NameField from './NameField';
|
||||||
import DescriptionEdit from './DescriptionEdit';
|
import DescriptionEdit from './DescriptionEdit';
|
||||||
import Tasks from './Tasks';
|
import Tasks from './Tasks';
|
||||||
@@ -17,11 +17,11 @@ import Activities from './Activities';
|
|||||||
import User from '../User';
|
import User from '../User';
|
||||||
import Label from '../Label';
|
import Label from '../Label';
|
||||||
import DueDate from '../DueDate';
|
import DueDate from '../DueDate';
|
||||||
import Timer from '../Timer';
|
import Stopwatch from '../Stopwatch';
|
||||||
import BoardMembershipsStep from '../BoardMembershipsStep';
|
import BoardMembershipsStep from '../BoardMembershipsStep';
|
||||||
import LabelsStep from '../LabelsStep';
|
import LabelsStep from '../LabelsStep';
|
||||||
import DueDateEditStep from '../DueDateEditStep';
|
import DueDateEditStep from '../DueDateEditStep';
|
||||||
import TimerEditStep from '../TimerEditStep';
|
import StopwatchEditStep from '../StopwatchEditStep';
|
||||||
import CardMoveStep from '../CardMoveStep';
|
import CardMoveStep from '../CardMoveStep';
|
||||||
import DeleteStep from '../DeleteStep';
|
import DeleteStep from '../DeleteStep';
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ const CardModal = React.memo(
|
|||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
stopwatch,
|
||||||
isSubscribed,
|
isSubscribed,
|
||||||
isActivitiesFetching,
|
isActivitiesFetching,
|
||||||
isAllActivitiesFetched,
|
isAllActivitiesFetched,
|
||||||
@@ -83,11 +83,11 @@ const CardModal = React.memo(
|
|||||||
|
|
||||||
const isGalleryOpened = useRef(false);
|
const isGalleryOpened = useRef(false);
|
||||||
|
|
||||||
const handleToggleTimerClick = useCallback(() => {
|
const handleToggleStopwatchClick = useCallback(() => {
|
||||||
onUpdate({
|
onUpdate({
|
||||||
timer: timer.startedAt ? stopTimer(timer) : startTimer(timer),
|
stopwatch: stopwatch.startedAt ? stopStopwatch(stopwatch) : startStopwatch(stopwatch),
|
||||||
});
|
});
|
||||||
}, [timer, onUpdate]);
|
}, [stopwatch, onUpdate]);
|
||||||
|
|
||||||
const handleNameUpdate = useCallback(
|
const handleNameUpdate = useCallback(
|
||||||
(newName) => {
|
(newName) => {
|
||||||
@@ -116,10 +116,10 @@ const CardModal = React.memo(
|
|||||||
[onUpdate],
|
[onUpdate],
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleTimerUpdate = useCallback(
|
const handleStopwatchUpdate = useCallback(
|
||||||
(newTimer) => {
|
(newStopwatch) => {
|
||||||
onUpdate({
|
onUpdate({
|
||||||
timer: newTimer,
|
stopwatch: newStopwatch,
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
[onUpdate],
|
[onUpdate],
|
||||||
@@ -160,7 +160,7 @@ const CardModal = React.memo(
|
|||||||
const BoardMembershipsPopup = usePopup(BoardMembershipsStep);
|
const BoardMembershipsPopup = usePopup(BoardMembershipsStep);
|
||||||
const LabelsPopup = usePopup(LabelsStep);
|
const LabelsPopup = usePopup(LabelsStep);
|
||||||
const DueDateEditPopup = usePopup(DueDateEditStep);
|
const DueDateEditPopup = usePopup(DueDateEditStep);
|
||||||
const TimerEditPopup = usePopup(TimerEditStep);
|
const StopwatchEditPopup = usePopup(StopwatchEditStep);
|
||||||
const CardMovePopup = usePopup(CardMoveStep);
|
const CardMovePopup = usePopup(CardMoveStep);
|
||||||
const DeletePopup = usePopup(DeleteStep);
|
const DeletePopup = usePopup(DeleteStep);
|
||||||
|
|
||||||
@@ -185,7 +185,7 @@ const CardModal = React.memo(
|
|||||||
</Grid.Row>
|
</Grid.Row>
|
||||||
<Grid.Row className={styles.modalPadding}>
|
<Grid.Row className={styles.modalPadding}>
|
||||||
<Grid.Column width={canEdit ? 12 : 16} className={styles.contentPadding}>
|
<Grid.Column width={canEdit ? 12 : 16} className={styles.contentPadding}>
|
||||||
{(users.length > 0 || labels.length > 0 || dueDate || timer) && (
|
{(users.length > 0 || labels.length > 0 || dueDate || stopwatch) && (
|
||||||
<div className={styles.moduleWrapper}>
|
<div className={styles.moduleWrapper}>
|
||||||
{users.length > 0 && (
|
{users.length > 0 && (
|
||||||
<div className={styles.attachments}>
|
<div className={styles.attachments}>
|
||||||
@@ -217,6 +217,7 @@ const CardModal = React.memo(
|
|||||||
onUserSelect={onUserAdd}
|
onUserSelect={onUserAdd}
|
||||||
onUserDeselect={onUserRemove}
|
onUserDeselect={onUserRemove}
|
||||||
>
|
>
|
||||||
|
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={classNames(styles.attachment, styles.dueDate)}
|
className={classNames(styles.attachment, styles.dueDate)}
|
||||||
@@ -266,6 +267,7 @@ const CardModal = React.memo(
|
|||||||
onMove={onLabelMove}
|
onMove={onLabelMove}
|
||||||
onDelete={onLabelDelete}
|
onDelete={onLabelDelete}
|
||||||
>
|
>
|
||||||
|
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={classNames(styles.attachment, styles.dueDate)}
|
className={classNames(styles.attachment, styles.dueDate)}
|
||||||
@@ -294,30 +296,34 @@ const CardModal = React.memo(
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{timer && (
|
{stopwatch && (
|
||||||
<div className={styles.attachments}>
|
<div className={styles.attachments}>
|
||||||
<div className={styles.text}>
|
<div className={styles.text}>
|
||||||
{t('common.timer', {
|
{t('common.stopwatch', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
<span className={styles.attachment}>
|
<span className={styles.attachment}>
|
||||||
{canEdit ? (
|
{canEdit ? (
|
||||||
<TimerEditPopup defaultValue={timer} onUpdate={handleTimerUpdate}>
|
<StopwatchEditPopup
|
||||||
<Timer startedAt={timer.startedAt} total={timer.total} />
|
defaultValue={stopwatch}
|
||||||
</TimerEditPopup>
|
onUpdate={handleStopwatchUpdate}
|
||||||
|
>
|
||||||
|
<Stopwatch startedAt={stopwatch.startedAt} total={stopwatch.total} />
|
||||||
|
</StopwatchEditPopup>
|
||||||
) : (
|
) : (
|
||||||
<Timer startedAt={timer.startedAt} total={timer.total} />
|
<Stopwatch startedAt={stopwatch.startedAt} total={stopwatch.total} />
|
||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
{canEdit && (
|
{canEdit && (
|
||||||
|
// eslint-disable-next-line jsx-a11y/control-has-associated-label
|
||||||
<button
|
<button
|
||||||
onClick={handleToggleTimerClick}
|
|
||||||
type="button"
|
type="button"
|
||||||
className={classNames(styles.attachment, styles.dueDate)}
|
className={classNames(styles.attachment, styles.dueDate)}
|
||||||
|
onClick={handleToggleStopwatchClick}
|
||||||
>
|
>
|
||||||
<Icon
|
<Icon
|
||||||
name={timer.startedAt ? 'pause' : 'play'}
|
name={stopwatch.startedAt ? 'pause' : 'play'}
|
||||||
size="small"
|
size="small"
|
||||||
className={styles.addAttachment}
|
className={styles.addAttachment}
|
||||||
/>
|
/>
|
||||||
@@ -447,12 +453,12 @@ const CardModal = React.memo(
|
|||||||
})}
|
})}
|
||||||
</Button>
|
</Button>
|
||||||
</DueDateEditPopup>
|
</DueDateEditPopup>
|
||||||
<TimerEditPopup defaultValue={timer} onUpdate={handleTimerUpdate}>
|
<StopwatchEditPopup defaultValue={stopwatch} onUpdate={handleStopwatchUpdate}>
|
||||||
<Button fluid className={styles.actionButton}>
|
<Button fluid className={styles.actionButton}>
|
||||||
<Icon name="clock outline" className={styles.actionIcon} />
|
<Icon name="clock outline" className={styles.actionIcon} />
|
||||||
{t('common.timer')}
|
{t('common.stopwatch')}
|
||||||
</Button>
|
</Button>
|
||||||
</TimerEditPopup>
|
</StopwatchEditPopup>
|
||||||
<AttachmentAddPopup onCreate={onAttachmentCreate}>
|
<AttachmentAddPopup onCreate={onAttachmentCreate}>
|
||||||
<Button fluid className={styles.actionButton}>
|
<Button fluid className={styles.actionButton}>
|
||||||
<Icon name="attach" className={styles.actionIcon} />
|
<Icon name="attach" className={styles.actionIcon} />
|
||||||
@@ -524,7 +530,7 @@ CardModal.propTypes = {
|
|||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
description: PropTypes.string,
|
description: PropTypes.string,
|
||||||
dueDate: PropTypes.instanceOf(Date),
|
dueDate: PropTypes.instanceOf(Date),
|
||||||
timer: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
isSubscribed: PropTypes.bool.isRequired,
|
isSubscribed: PropTypes.bool.isRequired,
|
||||||
isActivitiesFetching: PropTypes.bool.isRequired,
|
isActivitiesFetching: PropTypes.bool.isRequired,
|
||||||
isAllActivitiesFetched: PropTypes.bool.isRequired,
|
isAllActivitiesFetched: PropTypes.bool.isRequired,
|
||||||
@@ -577,7 +583,7 @@ CardModal.propTypes = {
|
|||||||
CardModal.defaultProps = {
|
CardModal.defaultProps = {
|
||||||
description: undefined,
|
description: undefined,
|
||||||
dueDate: undefined,
|
dueDate: undefined,
|
||||||
timer: undefined,
|
stopwatch: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default CardModal;
|
export default CardModal;
|
||||||
|
|||||||
@@ -100,7 +100,6 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
|
|||||||
onChange={setValue}
|
onChange={setValue}
|
||||||
/>
|
/>
|
||||||
<div className={styles.controls}>
|
<div className={styles.controls}>
|
||||||
{/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
|
|
||||||
<Button positive content={t('action.save')} />
|
<Button positive content={t('action.save')} />
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import TextareaAutosize from 'react-textarea-autosize';
|
import TextareaAutosize from 'react-textarea-autosize';
|
||||||
import { Button, Form, TextArea } from 'semantic-ui-react';
|
import { Button, Form, TextArea } from 'semantic-ui-react';
|
||||||
|
|
||||||
import { useClosableForm, useField } from '../../../hooks';
|
import { useField } from '../../../hooks';
|
||||||
|
|
||||||
import styles from './NameEdit.module.scss';
|
import styles from './NameEdit.module.scss';
|
||||||
|
|
||||||
@@ -28,12 +28,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
const submit = useCallback(() => {
|
const submit = useCallback(() => {
|
||||||
const cleanValue = value.trim();
|
const cleanValue = value.trim();
|
||||||
|
|
||||||
if (!cleanValue) {
|
if (cleanValue && cleanValue !== defaultValue) {
|
||||||
field.current.ref.current.select();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cleanValue !== defaultValue) {
|
|
||||||
onUpdate(cleanValue);
|
onUpdate(cleanValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,10 +55,9 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
[submit],
|
[submit],
|
||||||
);
|
);
|
||||||
|
|
||||||
const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
|
const handleFieldBlur = useCallback(() => {
|
||||||
close,
|
submit();
|
||||||
isOpened,
|
}, [submit]);
|
||||||
);
|
|
||||||
|
|
||||||
const handleSubmit = useCallback(() => {
|
const handleSubmit = useCallback(() => {
|
||||||
submit();
|
submit();
|
||||||
@@ -93,13 +87,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
onBlur={handleFieldBlur}
|
onBlur={handleFieldBlur}
|
||||||
/>
|
/>
|
||||||
<div className={styles.controls}>
|
<div className={styles.controls}>
|
||||||
{/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
|
<Button positive content={t('action.save')} />
|
||||||
<Button
|
|
||||||
positive
|
|
||||||
content={t('action.save')}
|
|
||||||
onMouseOver={handleControlMouseOver}
|
|
||||||
onMouseOut={handleControlMouseOut}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -48,14 +48,21 @@ const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onMove, onDelete
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{items.length > 0 && (
|
{items.length > 0 && (
|
||||||
<Progress
|
<>
|
||||||
autoSuccess
|
<span className={styles.progressWrapper}>
|
||||||
value={completedItems.length}
|
<Progress
|
||||||
total={items.length}
|
autoSuccess
|
||||||
color="blue"
|
value={completedItems.length}
|
||||||
size="tiny"
|
total={items.length}
|
||||||
className={styles.progress}
|
color="blue"
|
||||||
/>
|
size="tiny"
|
||||||
|
className={styles.progress}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
<span className={styles.count}>
|
||||||
|
{completedItems.length}/{items.length}
|
||||||
|
</span>
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
<DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
|
<DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
|
||||||
<Droppable droppableId="tasks" type={DroppableTypes.TASK}>
|
<Droppable droppableId="tasks" type={DroppableTypes.TASK}>
|
||||||
|
|||||||
@@ -3,6 +3,23 @@
|
|||||||
margin: 0 0 16px;
|
margin: 0 0 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.progressWrapper {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 3px 0;
|
||||||
|
vertical-align: top;
|
||||||
|
width: calc(100% - 50px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.count {
|
||||||
|
color: #8c8c8c;
|
||||||
|
display: inline-block;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 14px;
|
||||||
|
text-align: right;
|
||||||
|
vertical-align: top;
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
.taskButton {
|
.taskButton {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import PropTypes from 'prop-types';
|
|||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import getDateFormat from '../../utils/get-date-format';
|
||||||
|
|
||||||
import styles from './DueDate.module.scss';
|
import styles from './DueDate.module.scss';
|
||||||
|
|
||||||
const SIZES = {
|
const SIZES = {
|
||||||
@@ -12,15 +14,27 @@ const SIZES = {
|
|||||||
MEDIUM: 'medium',
|
MEDIUM: 'medium',
|
||||||
};
|
};
|
||||||
|
|
||||||
const FORMATS = {
|
const LONG_DATE_FORMAT_BY_SIZE = {
|
||||||
tiny: 'longDate',
|
tiny: 'longDate',
|
||||||
small: 'longDate',
|
small: 'longDate',
|
||||||
medium: 'longDateTime',
|
medium: 'longDateTime',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const FULL_DATE_FORMAT_BY_SIZE = {
|
||||||
|
tiny: 'fullDate',
|
||||||
|
small: 'fullDate',
|
||||||
|
medium: 'fullDateTime',
|
||||||
|
};
|
||||||
|
|
||||||
const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
|
||||||
|
const dateFormat = getDateFormat(
|
||||||
|
value,
|
||||||
|
LONG_DATE_FORMAT_BY_SIZE[size],
|
||||||
|
FULL_DATE_FORMAT_BY_SIZE[size],
|
||||||
|
);
|
||||||
|
|
||||||
const contentNode = (
|
const contentNode = (
|
||||||
<span
|
<span
|
||||||
className={classNames(
|
className={classNames(
|
||||||
@@ -29,7 +43,7 @@ const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
|||||||
onClick && styles.wrapperHoverable,
|
onClick && styles.wrapperHoverable,
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{t(`format:${FORMATS[size]}`, {
|
{t(`format:${dateFormat}`, {
|
||||||
value,
|
value,
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { Icon, Menu } from 'semantic-ui-react';
|
import { Button, Icon, Menu } from 'semantic-ui-react';
|
||||||
import { usePopup } from '../../lib/popup';
|
import { usePopup } from '../../lib/popup';
|
||||||
|
|
||||||
import Paths from '../../constants/Paths';
|
import Paths from '../../constants/Paths';
|
||||||
@@ -55,15 +55,16 @@ const Header = React.memo(
|
|||||||
>
|
>
|
||||||
<Icon fitted name="arrow left" />
|
<Icon fitted name="arrow left" />
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item
|
<Menu.Item className={classNames(styles.item, styles.title)}>
|
||||||
className={classNames(
|
|
||||||
styles.item,
|
|
||||||
canEditProject && styles.itemHoverable,
|
|
||||||
styles.title,
|
|
||||||
)}
|
|
||||||
onClick={handleProjectSettingsClick}
|
|
||||||
>
|
|
||||||
{project.name}
|
{project.name}
|
||||||
|
{canEditProject && (
|
||||||
|
<Button
|
||||||
|
className={classNames(styles.editButton, styles.target)}
|
||||||
|
onClick={handleProjectSettingsClick}
|
||||||
|
>
|
||||||
|
<Icon fitted name="pencil" size="small" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu.Menu>
|
</Menu.Menu>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,4 +1,20 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
|
.editButton {
|
||||||
|
background: transparent;
|
||||||
|
box-shadow: none;
|
||||||
|
color: #fff;
|
||||||
|
font-size: 15px;
|
||||||
|
line-height: 34px;
|
||||||
|
margin-left: 8px;
|
||||||
|
opacity: 0;
|
||||||
|
padding: 0;
|
||||||
|
width: 34px;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.item {
|
.item {
|
||||||
cursor: auto;
|
cursor: auto;
|
||||||
user-select: auto;
|
user-select: auto;
|
||||||
@@ -11,6 +27,10 @@
|
|||||||
&:hover {
|
&:hover {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: rgba(255, 255, 255, 0.9);
|
color: rgba(255, 255, 255, 0.9);
|
||||||
|
|
||||||
|
.target {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 5px;
|
width: 5px;
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 5px;
|
width: 5px;
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
max-height: calc(100vh - 268px);
|
max-height: calc(100vh - 268px);
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
width: 290px;
|
width: 290px;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Form, Grid, Header, Message } from 'semantic-ui-react';
|
import { Button, Form, Grid, Header, Message } from 'semantic-ui-react';
|
||||||
import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks';
|
import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks';
|
||||||
import { Input } from '../../lib/custom-ui';
|
import { Input } from '../../lib/custom-ui';
|
||||||
|
|
||||||
@@ -28,6 +28,21 @@ const createMessage = (error) => {
|
|||||||
type: 'error',
|
type: 'error',
|
||||||
content: 'common.invalidPassword',
|
content: 'common.invalidPassword',
|
||||||
};
|
};
|
||||||
|
case 'Use single sign-on':
|
||||||
|
return {
|
||||||
|
type: 'error',
|
||||||
|
content: 'common.useSingleSignOn',
|
||||||
|
};
|
||||||
|
case 'Email already in use':
|
||||||
|
return {
|
||||||
|
type: 'error',
|
||||||
|
content: 'common.emailAlreadyInUse',
|
||||||
|
};
|
||||||
|
case 'Username already in use':
|
||||||
|
return {
|
||||||
|
type: 'error',
|
||||||
|
content: 'common.usernameAlreadyInUse',
|
||||||
|
};
|
||||||
case 'Failed to fetch':
|
case 'Failed to fetch':
|
||||||
return {
|
return {
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
@@ -47,7 +62,17 @@ const createMessage = (error) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const Login = React.memo(
|
const Login = React.memo(
|
||||||
({ defaultData, isSubmitting, error, onAuthenticate, onMessageDismiss }) => {
|
({
|
||||||
|
defaultData,
|
||||||
|
isSubmitting,
|
||||||
|
isSubmittingUsingOidc,
|
||||||
|
error,
|
||||||
|
withOidc,
|
||||||
|
isOidcEnforced,
|
||||||
|
onAuthenticate,
|
||||||
|
onAuthenticateUsingOidc,
|
||||||
|
onMessageDismiss,
|
||||||
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const wasSubmitting = usePrevious(isSubmitting);
|
const wasSubmitting = usePrevious(isSubmitting);
|
||||||
|
|
||||||
@@ -83,8 +108,10 @@ const Login = React.memo(
|
|||||||
}, [onAuthenticate, data]);
|
}, [onAuthenticate, data]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
emailOrUsernameField.current.focus();
|
if (!isOidcEnforced) {
|
||||||
}, []);
|
emailOrUsernameField.current.focus();
|
||||||
|
}
|
||||||
|
}, [isOidcEnforced]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (wasSubmitting && !isSubmitting && error) {
|
if (wasSubmitting && !isSubmitting && error) {
|
||||||
@@ -135,42 +162,58 @@ const Login = React.memo(
|
|||||||
onDismiss={onMessageDismiss}
|
onDismiss={onMessageDismiss}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<Form size="large" onSubmit={handleSubmit}>
|
{!isOidcEnforced && (
|
||||||
<div className={styles.inputWrapper}>
|
<Form size="large" onSubmit={handleSubmit}>
|
||||||
<div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
|
<div className={styles.inputWrapper}>
|
||||||
<Input
|
<div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
|
||||||
fluid
|
<Input
|
||||||
ref={emailOrUsernameField}
|
fluid
|
||||||
name="emailOrUsername"
|
ref={emailOrUsernameField}
|
||||||
value={data.emailOrUsername}
|
name="emailOrUsername"
|
||||||
readOnly={isSubmitting}
|
value={data.emailOrUsername}
|
||||||
className={styles.input}
|
readOnly={isSubmitting}
|
||||||
onChange={handleFieldChange}
|
className={styles.input}
|
||||||
|
onChange={handleFieldChange}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className={styles.inputWrapper}>
|
||||||
|
<div className={styles.inputLabel}>{t('common.password')}</div>
|
||||||
|
<Input.Password
|
||||||
|
fluid
|
||||||
|
ref={passwordField}
|
||||||
|
name="password"
|
||||||
|
value={data.password}
|
||||||
|
readOnly={isSubmitting}
|
||||||
|
className={styles.input}
|
||||||
|
onChange={handleFieldChange}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<Form.Button
|
||||||
|
primary
|
||||||
|
size="large"
|
||||||
|
icon="right arrow"
|
||||||
|
labelPosition="right"
|
||||||
|
content={t('action.logIn')}
|
||||||
|
floated="right"
|
||||||
|
loading={isSubmitting}
|
||||||
|
disabled={isSubmitting || isSubmittingUsingOidc}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Form>
|
||||||
<div className={styles.inputWrapper}>
|
)}
|
||||||
<div className={styles.inputLabel}>{t('common.password')}</div>
|
{withOidc && (
|
||||||
<Input.Password
|
<Button
|
||||||
fluid
|
type="button"
|
||||||
ref={passwordField}
|
fluid={isOidcEnforced}
|
||||||
name="password"
|
primary={isOidcEnforced}
|
||||||
value={data.password}
|
size={isOidcEnforced ? 'large' : undefined}
|
||||||
readOnly={isSubmitting}
|
icon={isOidcEnforced ? 'right arrow' : undefined}
|
||||||
className={styles.input}
|
labelPosition={isOidcEnforced ? 'right' : undefined}
|
||||||
onChange={handleFieldChange}
|
content={t('action.logInWithSSO')}
|
||||||
/>
|
loading={isSubmittingUsingOidc}
|
||||||
</div>
|
disabled={isSubmitting || isSubmittingUsingOidc}
|
||||||
<Form.Button
|
onClick={onAuthenticateUsingOidc}
|
||||||
primary
|
|
||||||
size="large"
|
|
||||||
icon="right arrow"
|
|
||||||
labelPosition="right"
|
|
||||||
content={t('action.logIn')}
|
|
||||||
floated="right"
|
|
||||||
loading={isSubmitting}
|
|
||||||
disabled={isSubmitting}
|
|
||||||
/>
|
/>
|
||||||
</Form>
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Grid.Column>
|
</Grid.Column>
|
||||||
@@ -201,10 +244,16 @@ const Login = React.memo(
|
|||||||
);
|
);
|
||||||
|
|
||||||
Login.propTypes = {
|
Login.propTypes = {
|
||||||
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
/* eslint-disable react/forbid-prop-types */
|
||||||
|
defaultData: PropTypes.object.isRequired,
|
||||||
|
/* eslint-enable react/forbid-prop-types */
|
||||||
isSubmitting: PropTypes.bool.isRequired,
|
isSubmitting: PropTypes.bool.isRequired,
|
||||||
|
isSubmittingUsingOidc: PropTypes.bool.isRequired,
|
||||||
error: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
error: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
|
withOidc: PropTypes.bool.isRequired,
|
||||||
|
isOidcEnforced: PropTypes.bool.isRequired,
|
||||||
onAuthenticate: PropTypes.func.isRequired,
|
onAuthenticate: PropTypes.func.isRequired,
|
||||||
|
onAuthenticateUsingOidc: PropTypes.func.isRequired,
|
||||||
onMessageDismiss: PropTypes.func.isRequired,
|
onMessageDismiss: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { Loader } from 'semantic-ui-react';
|
||||||
|
|
||||||
|
import LoginContainer from '../containers/LoginContainer';
|
||||||
|
|
||||||
|
const LoginWrapper = React.memo(({ isInitializing }) => {
|
||||||
|
if (isInitializing) {
|
||||||
|
return <Loader active size="massive" />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return <LoginContainer />;
|
||||||
|
});
|
||||||
|
|
||||||
|
LoginWrapper.propTypes = {
|
||||||
|
isInitializing: PropTypes.bool.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default LoginWrapper;
|
||||||
@@ -4,7 +4,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 5px;
|
width: 5px;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { Route, Routes } from 'react-router-dom';
|
|||||||
import { ReduxRouter } from '../lib/redux-router';
|
import { ReduxRouter } from '../lib/redux-router';
|
||||||
|
|
||||||
import Paths from '../constants/Paths';
|
import Paths from '../constants/Paths';
|
||||||
import LoginContainer from '../containers/LoginContainer';
|
import LoginWrapperContainer from '../containers/LoginWrapperContainer';
|
||||||
import CoreContainer from '../containers/CoreContainer';
|
import CoreContainer from '../containers/CoreContainer';
|
||||||
import NotFound from './NotFound';
|
import NotFound from './NotFound';
|
||||||
|
|
||||||
@@ -13,7 +13,6 @@ import 'react-datepicker/dist/react-datepicker.css';
|
|||||||
import 'photoswipe/dist/photoswipe.css';
|
import 'photoswipe/dist/photoswipe.css';
|
||||||
import 'easymde/dist/easymde.min.css';
|
import 'easymde/dist/easymde.min.css';
|
||||||
import '../lib/custom-ui/styles.css';
|
import '../lib/custom-ui/styles.css';
|
||||||
|
|
||||||
import '../styles.module.scss';
|
import '../styles.module.scss';
|
||||||
|
|
||||||
function Root({ store, history }) {
|
function Root({ store, history }) {
|
||||||
@@ -21,7 +20,8 @@ function Root({ store, history }) {
|
|||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<ReduxRouter history={history}>
|
<ReduxRouter history={history}>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path={Paths.LOGIN} element={<LoginContainer />} />
|
<Route path={Paths.LOGIN} element={<LoginWrapperContainer />} />
|
||||||
|
<Route path={Paths.OIDC_CALLBACK} element={<LoginWrapperContainer />} />
|
||||||
<Route path={Paths.ROOT} element={<CoreContainer />} />
|
<Route path={Paths.ROOT} element={<CoreContainer />} />
|
||||||
<Route path={Paths.PROJECTS} element={<CoreContainer />} />
|
<Route path={Paths.PROJECTS} element={<CoreContainer />} />
|
||||||
<Route path={Paths.BOARDS} element={<CoreContainer />} />
|
<Route path={Paths.BOARDS} element={<CoreContainer />} />
|
||||||
|
|||||||
+7
-7
@@ -4,9 +4,9 @@ import PropTypes from 'prop-types';
|
|||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { useForceUpdate, usePrevious } from '../../lib/hooks';
|
import { useForceUpdate, usePrevious } from '../../lib/hooks';
|
||||||
|
|
||||||
import { formatTimer } from '../../utils/timer';
|
import { formatStopwatch } from '../../utils/stopwatch';
|
||||||
|
|
||||||
import styles from './Timer.module.scss';
|
import styles from './Stopwatch.module.scss';
|
||||||
|
|
||||||
const SIZES = {
|
const SIZES = {
|
||||||
TINY: 'tiny',
|
TINY: 'tiny',
|
||||||
@@ -14,7 +14,7 @@ const SIZES = {
|
|||||||
MEDIUM: 'medium',
|
MEDIUM: 'medium',
|
||||||
};
|
};
|
||||||
|
|
||||||
const Timer = React.memo(({ as, startedAt, total, size, isDisabled, onClick }) => {
|
const Stopwatch = React.memo(({ as, startedAt, total, size, isDisabled, onClick }) => {
|
||||||
const prevStartedAt = usePrevious(startedAt);
|
const prevStartedAt = usePrevious(startedAt);
|
||||||
const forceUpdate = useForceUpdate();
|
const forceUpdate = useForceUpdate();
|
||||||
|
|
||||||
@@ -56,7 +56,7 @@ const Timer = React.memo(({ as, startedAt, total, size, isDisabled, onClick }) =
|
|||||||
onClick && styles.wrapperHoverable,
|
onClick && styles.wrapperHoverable,
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{formatTimer({ startedAt, total })}
|
{formatStopwatch({ startedAt, total })}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@ const Timer = React.memo(({ as, startedAt, total, size, isDisabled, onClick }) =
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
Timer.propTypes = {
|
Stopwatch.propTypes = {
|
||||||
as: PropTypes.elementType,
|
as: PropTypes.elementType,
|
||||||
startedAt: PropTypes.instanceOf(Date),
|
startedAt: PropTypes.instanceOf(Date),
|
||||||
total: PropTypes.number.isRequired, // eslint-disable-line react/no-unused-prop-types
|
total: PropTypes.number.isRequired, // eslint-disable-line react/no-unused-prop-types
|
||||||
@@ -80,7 +80,7 @@ Timer.propTypes = {
|
|||||||
onClick: PropTypes.func,
|
onClick: PropTypes.func,
|
||||||
};
|
};
|
||||||
|
|
||||||
Timer.defaultProps = {
|
Stopwatch.defaultProps = {
|
||||||
as: 'button',
|
as: 'button',
|
||||||
startedAt: undefined,
|
startedAt: undefined,
|
||||||
size: SIZES.MEDIUM,
|
size: SIZES.MEDIUM,
|
||||||
@@ -88,4 +88,4 @@ Timer.defaultProps = {
|
|||||||
onClick: undefined,
|
onClick: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Timer;
|
export default Stopwatch;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import Stopwatch from './Stopwatch';
|
||||||
|
|
||||||
|
export default Stopwatch;
|
||||||
+21
-15
@@ -7,12 +7,18 @@ import { useToggle } from '../../lib/hooks';
|
|||||||
import { Input, Popup } from '../../lib/custom-ui';
|
import { Input, Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useForm } from '../../hooks';
|
import { useForm } from '../../hooks';
|
||||||
import { createTimer, getTimerParts, startTimer, stopTimer, updateTimer } from '../../utils/timer';
|
import {
|
||||||
|
createStopwatch,
|
||||||
|
getStopwatchParts,
|
||||||
|
startStopwatch,
|
||||||
|
stopStopwatch,
|
||||||
|
updateStopwatch,
|
||||||
|
} from '../../utils/stopwatch';
|
||||||
|
|
||||||
import styles from './TimerEditStep.module.scss';
|
import styles from './StopwatchEditStep.module.scss';
|
||||||
|
|
||||||
const createData = (timer) => {
|
const createData = (stopwatch) => {
|
||||||
if (!timer) {
|
if (!stopwatch) {
|
||||||
return {
|
return {
|
||||||
hours: '0',
|
hours: '0',
|
||||||
minutes: '0',
|
minutes: '0',
|
||||||
@@ -20,7 +26,7 @@ const createData = (timer) => {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const { hours, minutes, seconds } = getTimerParts(timer);
|
const { hours, minutes, seconds } = getStopwatchParts(stopwatch);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
hours: `${hours}`,
|
hours: `${hours}`,
|
||||||
@@ -29,7 +35,7 @@ const createData = (timer) => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) => {
|
const StopwatchEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [data, handleFieldChange, setData] = useForm(() => createData(defaultValue));
|
const [data, handleFieldChange, setData] = useForm(() => createData(defaultValue));
|
||||||
const [isEditing, toggleEditing] = useToggle();
|
const [isEditing, toggleEditing] = useToggle();
|
||||||
@@ -39,12 +45,12 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
|
|||||||
const secondsField = useRef(null);
|
const secondsField = useRef(null);
|
||||||
|
|
||||||
const handleStartClick = useCallback(() => {
|
const handleStartClick = useCallback(() => {
|
||||||
onUpdate(startTimer(defaultValue));
|
onUpdate(startStopwatch(defaultValue));
|
||||||
onClose();
|
onClose();
|
||||||
}, [defaultValue, onUpdate, onClose]);
|
}, [defaultValue, onUpdate, onClose]);
|
||||||
|
|
||||||
const handleStopClick = useCallback(() => {
|
const handleStopClick = useCallback(() => {
|
||||||
onUpdate(stopTimer(defaultValue));
|
onUpdate(stopStopwatch(defaultValue));
|
||||||
}, [defaultValue, onUpdate]);
|
}, [defaultValue, onUpdate]);
|
||||||
|
|
||||||
const handleClearClick = useCallback(() => {
|
const handleClearClick = useCallback(() => {
|
||||||
@@ -83,11 +89,11 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (defaultValue) {
|
if (defaultValue) {
|
||||||
if (!dequal(parts, getTimerParts(defaultValue))) {
|
if (!dequal(parts, getStopwatchParts(defaultValue))) {
|
||||||
onUpdate(updateTimer(defaultValue, parts));
|
onUpdate(updateStopwatch(defaultValue, parts));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
onUpdate(createTimer(parts));
|
onUpdate(createStopwatch(parts));
|
||||||
}
|
}
|
||||||
|
|
||||||
onClose();
|
onClose();
|
||||||
@@ -102,7 +108,7 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup.Header onBack={onBack}>
|
<Popup.Header onBack={onBack}>
|
||||||
{t('common.editTimer', {
|
{t('common.editStopwatch', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Popup.Header>
|
</Popup.Header>
|
||||||
@@ -171,16 +177,16 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
TimerEditStep.propTypes = {
|
StopwatchEditStep.propTypes = {
|
||||||
defaultValue: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
defaultValue: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onBack: PropTypes.func,
|
onBack: PropTypes.func,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
TimerEditStep.defaultProps = {
|
StopwatchEditStep.defaultProps = {
|
||||||
defaultValue: undefined,
|
defaultValue: undefined,
|
||||||
onBack: undefined,
|
onBack: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default TimerEditStep;
|
export default StopwatchEditStep;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import StopwatchEditStep from './StopwatchEditStep';
|
||||||
|
|
||||||
|
export default StopwatchEditStep;
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
import Timer from './Timer';
|
|
||||||
|
|
||||||
export default Timer;
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
import TimerEditStep from './TimerEditStep';
|
|
||||||
|
|
||||||
export default TimerEditStep;
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { dequal } from 'dequal';
|
import { dequal } from 'dequal';
|
||||||
|
import omit from 'lodash/omit';
|
||||||
import pickBy from 'lodash/pickBy';
|
import pickBy from 'lodash/pickBy';
|
||||||
import React, { useCallback, useMemo, useRef } from 'react';
|
import React, { useCallback, useMemo, useRef } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
@@ -9,7 +10,7 @@ import { useForm } from '../../hooks';
|
|||||||
|
|
||||||
import styles from './UserInformationEdit.module.scss';
|
import styles from './UserInformationEdit.module.scss';
|
||||||
|
|
||||||
const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
const UserInformationEdit = React.memo(({ defaultData, isNameEditable, onUpdate }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
|
||||||
const [data, handleFieldChange] = useForm(() => ({
|
const [data, handleFieldChange] = useForm(() => ({
|
||||||
@@ -32,13 +33,17 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
|||||||
const nameField = useRef(null);
|
const nameField = useRef(null);
|
||||||
|
|
||||||
const handleSubmit = useCallback(() => {
|
const handleSubmit = useCallback(() => {
|
||||||
if (!cleanData.name) {
|
if (isNameEditable) {
|
||||||
nameField.current.select();
|
if (!cleanData.name) {
|
||||||
return;
|
nameField.current.select();
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
onUpdate(cleanData);
|
onUpdate(cleanData);
|
||||||
}, [onUpdate, cleanData]);
|
} else {
|
||||||
|
onUpdate(omit(cleanData, 'name'));
|
||||||
|
}
|
||||||
|
}, [isNameEditable, onUpdate, cleanData]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Form onSubmit={handleSubmit}>
|
<Form onSubmit={handleSubmit}>
|
||||||
@@ -48,6 +53,7 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
|||||||
ref={nameField}
|
ref={nameField}
|
||||||
name="name"
|
name="name"
|
||||||
value={data.name}
|
value={data.name}
|
||||||
|
disabled={!isNameEditable}
|
||||||
className={styles.field}
|
className={styles.field}
|
||||||
onChange={handleFieldChange}
|
onChange={handleFieldChange}
|
||||||
/>
|
/>
|
||||||
@@ -74,6 +80,7 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
|||||||
|
|
||||||
UserInformationEdit.propTypes = {
|
UserInformationEdit.propTypes = {
|
||||||
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
isNameEditable: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,33 +5,40 @@ import { Popup } from '../lib/custom-ui';
|
|||||||
|
|
||||||
import UserInformationEdit from './UserInformationEdit';
|
import UserInformationEdit from './UserInformationEdit';
|
||||||
|
|
||||||
const UserInformationEditStep = React.memo(({ defaultData, onUpdate, onBack, onClose }) => {
|
const UserInformationEditStep = React.memo(
|
||||||
const [t] = useTranslation();
|
({ defaultData, isNameEditable, onUpdate, onBack, onClose }) => {
|
||||||
|
const [t] = useTranslation();
|
||||||
|
|
||||||
const handleUpdate = useCallback(
|
const handleUpdate = useCallback(
|
||||||
(data) => {
|
(data) => {
|
||||||
onUpdate(data);
|
onUpdate(data);
|
||||||
onClose();
|
onClose();
|
||||||
},
|
},
|
||||||
[onUpdate, onClose],
|
[onUpdate, onClose],
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup.Header onBack={onBack}>
|
<Popup.Header onBack={onBack}>
|
||||||
{t('common.editInformation', {
|
{t('common.editInformation', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Popup.Header>
|
</Popup.Header>
|
||||||
<Popup.Content>
|
<Popup.Content>
|
||||||
<UserInformationEdit defaultData={defaultData} onUpdate={handleUpdate} />
|
<UserInformationEdit
|
||||||
</Popup.Content>
|
defaultData={defaultData}
|
||||||
</>
|
isNameEditable={isNameEditable}
|
||||||
);
|
onUpdate={handleUpdate}
|
||||||
});
|
/>
|
||||||
|
</Popup.Content>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
UserInformationEditStep.propTypes = {
|
UserInformationEditStep.propTypes = {
|
||||||
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
isNameEditable: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onBack: PropTypes.func,
|
onBack: PropTypes.func,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ const AccountPane = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
@@ -74,6 +76,7 @@ const AccountPane = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
organization,
|
organization,
|
||||||
}}
|
}}
|
||||||
|
isNameEditable={!isLocked}
|
||||||
onUpdate={onUpdate}
|
onUpdate={onUpdate}
|
||||||
/>
|
/>
|
||||||
<Divider horizontal section>
|
<Divider horizontal section>
|
||||||
@@ -102,63 +105,73 @@ const AccountPane = React.memo(
|
|||||||
value={language || 'auto'}
|
value={language || 'auto'}
|
||||||
onChange={handleLanguageChange}
|
onChange={handleLanguageChange}
|
||||||
/>
|
/>
|
||||||
<Divider horizontal section>
|
{(!isLocked || !isUsernameLocked) && (
|
||||||
<Header as="h4">
|
<>
|
||||||
{t('common.authentication', {
|
<Divider horizontal section>
|
||||||
context: 'title',
|
<Header as="h4">
|
||||||
})}
|
{t('common.authentication', {
|
||||||
</Header>
|
context: 'title',
|
||||||
</Divider>
|
})}
|
||||||
<div className={styles.action}>
|
</Header>
|
||||||
<UserUsernameEditPopup
|
</Divider>
|
||||||
usePasswordConfirmation
|
{!isUsernameLocked && (
|
||||||
defaultData={usernameUpdateForm.data}
|
<div className={styles.action}>
|
||||||
username={username}
|
<UserUsernameEditPopup
|
||||||
isSubmitting={usernameUpdateForm.isSubmitting}
|
defaultData={usernameUpdateForm.data}
|
||||||
error={usernameUpdateForm.error}
|
username={username}
|
||||||
onUpdate={onUsernameUpdate}
|
isSubmitting={usernameUpdateForm.isSubmitting}
|
||||||
onMessageDismiss={onUsernameUpdateMessageDismiss}
|
error={usernameUpdateForm.error}
|
||||||
>
|
usePasswordConfirmation={!isLocked} // FIXME: hack
|
||||||
<Button className={styles.actionButton}>
|
onUpdate={onUsernameUpdate}
|
||||||
{t('action.editUsername', {
|
onMessageDismiss={onUsernameUpdateMessageDismiss}
|
||||||
context: 'title',
|
>
|
||||||
})}
|
<Button className={styles.actionButton}>
|
||||||
</Button>
|
{t('action.editUsername', {
|
||||||
</UserUsernameEditPopup>
|
context: 'title',
|
||||||
</div>
|
})}
|
||||||
<div className={styles.action}>
|
</Button>
|
||||||
<UserEmailEditPopup
|
</UserUsernameEditPopup>
|
||||||
usePasswordConfirmation
|
</div>
|
||||||
defaultData={emailUpdateForm.data}
|
)}
|
||||||
email={email}
|
{!isLocked && (
|
||||||
isSubmitting={emailUpdateForm.isSubmitting}
|
<>
|
||||||
error={emailUpdateForm.error}
|
<div className={styles.action}>
|
||||||
onUpdate={onEmailUpdate}
|
<UserEmailEditPopup
|
||||||
onMessageDismiss={onEmailUpdateMessageDismiss}
|
usePasswordConfirmation
|
||||||
>
|
defaultData={emailUpdateForm.data}
|
||||||
<Button className={styles.actionButton}>
|
email={email}
|
||||||
{t('action.editEmail', {
|
isSubmitting={emailUpdateForm.isSubmitting}
|
||||||
context: 'title',
|
error={emailUpdateForm.error}
|
||||||
})}
|
onUpdate={onEmailUpdate}
|
||||||
</Button>
|
onMessageDismiss={onEmailUpdateMessageDismiss}
|
||||||
</UserEmailEditPopup>
|
>
|
||||||
</div>
|
<Button className={styles.actionButton}>
|
||||||
<div className={styles.action}>
|
{t('action.editEmail', {
|
||||||
<UserPasswordEditPopup
|
context: 'title',
|
||||||
usePasswordConfirmation
|
})}
|
||||||
defaultData={passwordUpdateForm.data}
|
</Button>
|
||||||
isSubmitting={passwordUpdateForm.isSubmitting}
|
</UserEmailEditPopup>
|
||||||
error={passwordUpdateForm.error}
|
</div>
|
||||||
onUpdate={onPasswordUpdate}
|
<div className={styles.action}>
|
||||||
onMessageDismiss={onPasswordUpdateMessageDismiss}
|
<UserPasswordEditPopup
|
||||||
>
|
usePasswordConfirmation
|
||||||
<Button className={styles.actionButton}>
|
defaultData={passwordUpdateForm.data}
|
||||||
{t('action.editPassword', {
|
isSubmitting={passwordUpdateForm.isSubmitting}
|
||||||
context: 'title',
|
error={passwordUpdateForm.error}
|
||||||
})}
|
onUpdate={onPasswordUpdate}
|
||||||
</Button>
|
onMessageDismiss={onPasswordUpdateMessageDismiss}
|
||||||
</UserPasswordEditPopup>
|
>
|
||||||
</div>
|
<Button className={styles.actionButton}>
|
||||||
|
{t('action.editPassword', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Button>
|
||||||
|
</UserPasswordEditPopup>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</Tab.Pane>
|
</Tab.Pane>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -172,6 +185,8 @@ AccountPane.propTypes = {
|
|||||||
phone: PropTypes.string,
|
phone: PropTypes.string,
|
||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
language: PropTypes.string,
|
language: PropTypes.string,
|
||||||
|
isLocked: PropTypes.bool.isRequired,
|
||||||
|
isUsernameLocked: PropTypes.bool.isRequired,
|
||||||
isAvatarUpdating: PropTypes.bool.isRequired,
|
isAvatarUpdating: PropTypes.bool.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
usernameUpdateForm: PropTypes.object.isRequired,
|
usernameUpdateForm: PropTypes.object.isRequired,
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ const UserSettingsModal = React.memo(
|
|||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
subscribeToOwnCards,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
@@ -48,6 +50,8 @@ const UserSettingsModal = React.memo(
|
|||||||
phone={phone}
|
phone={phone}
|
||||||
organization={organization}
|
organization={organization}
|
||||||
language={language}
|
language={language}
|
||||||
|
isLocked={isLocked}
|
||||||
|
isUsernameLocked={isUsernameLocked}
|
||||||
isAvatarUpdating={isAvatarUpdating}
|
isAvatarUpdating={isAvatarUpdating}
|
||||||
usernameUpdateForm={usernameUpdateForm}
|
usernameUpdateForm={usernameUpdateForm}
|
||||||
emailUpdateForm={emailUpdateForm}
|
emailUpdateForm={emailUpdateForm}
|
||||||
@@ -105,6 +109,8 @@ UserSettingsModal.propTypes = {
|
|||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
language: PropTypes.string,
|
language: PropTypes.string,
|
||||||
subscribeToOwnCards: PropTypes.bool.isRequired,
|
subscribeToOwnCards: PropTypes.bool.isRequired,
|
||||||
|
isLocked: PropTypes.bool.isRequired,
|
||||||
|
isUsernameLocked: PropTypes.bool.isRequired,
|
||||||
isAvatarUpdating: PropTypes.bool.isRequired,
|
isAvatarUpdating: PropTypes.bool.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
usernameUpdateForm: PropTypes.object.isRequired,
|
usernameUpdateForm: PropTypes.object.isRequired,
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ const ActionsStep = React.memo(
|
|||||||
return (
|
return (
|
||||||
<UserInformationEditStep
|
<UserInformationEditStep
|
||||||
defaultData={pick(user, ['name', 'phone', 'organization'])}
|
defaultData={pick(user, ['name', 'phone', 'organization'])}
|
||||||
|
isNameEditable={!user.isLocked}
|
||||||
onUpdate={onUpdate}
|
onUpdate={onUpdate}
|
||||||
onBack={handleBack}
|
onBack={handleBack}
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
@@ -135,26 +136,34 @@ const ActionsStep = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
|
{!user.isUsernameLocked && (
|
||||||
{t('action.editUsername', {
|
<Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
|
||||||
context: 'title',
|
{t('action.editUsername', {
|
||||||
})}
|
context: 'title',
|
||||||
</Menu.Item>
|
})}
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditEmailClick}>
|
</Menu.Item>
|
||||||
{t('action.editEmail', {
|
)}
|
||||||
context: 'title',
|
{!user.isLocked && (
|
||||||
})}
|
<>
|
||||||
</Menu.Item>
|
<Menu.Item className={styles.menuItem} onClick={handleEditEmailClick}>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditPasswordClick}>
|
{t('action.editEmail', {
|
||||||
{t('action.editPassword', {
|
context: 'title',
|
||||||
context: 'title',
|
})}
|
||||||
})}
|
</Menu.Item>
|
||||||
</Menu.Item>
|
<Menu.Item className={styles.menuItem} onClick={handleEditPasswordClick}>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
{t('action.editPassword', {
|
||||||
{t('action.deleteUser', {
|
context: 'title',
|
||||||
context: 'title',
|
})}
|
||||||
})}
|
</Menu.Item>
|
||||||
</Menu.Item>
|
</>
|
||||||
|
)}
|
||||||
|
{!user.isDeletionLocked && (
|
||||||
|
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
||||||
|
{t('action.deleteUser', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Menu.Item>
|
||||||
|
)}
|
||||||
</Menu>
|
</Menu>
|
||||||
</Popup.Content>
|
</Popup.Content>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ const Item = React.memo(
|
|||||||
organization,
|
organization,
|
||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
|
isLocked,
|
||||||
|
isRoleLocked,
|
||||||
|
isUsernameLocked,
|
||||||
|
isDeletionLocked,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
@@ -46,7 +50,7 @@ const Item = React.memo(
|
|||||||
<Table.Cell>{username || '-'}</Table.Cell>
|
<Table.Cell>{username || '-'}</Table.Cell>
|
||||||
<Table.Cell>{email}</Table.Cell>
|
<Table.Cell>{email}</Table.Cell>
|
||||||
<Table.Cell>
|
<Table.Cell>
|
||||||
<Radio toggle checked={isAdmin} onChange={handleIsAdminChange} />
|
<Radio toggle checked={isAdmin} disabled={isRoleLocked} onChange={handleIsAdminChange} />
|
||||||
</Table.Cell>
|
</Table.Cell>
|
||||||
<Table.Cell textAlign="right">
|
<Table.Cell textAlign="right">
|
||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
@@ -57,6 +61,9 @@ const Item = React.memo(
|
|||||||
organization,
|
organization,
|
||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
|
isDeletionLocked,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
@@ -88,6 +95,10 @@ Item.propTypes = {
|
|||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
phone: PropTypes.string,
|
phone: PropTypes.string,
|
||||||
isAdmin: PropTypes.bool.isRequired,
|
isAdmin: PropTypes.bool.isRequired,
|
||||||
|
isLocked: PropTypes.bool.isRequired,
|
||||||
|
isRoleLocked: PropTypes.bool.isRequired,
|
||||||
|
isUsernameLocked: PropTypes.bool.isRequired,
|
||||||
|
isDeletionLocked: PropTypes.bool.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
emailUpdateForm: PropTypes.object.isRequired,
|
emailUpdateForm: PropTypes.object.isRequired,
|
||||||
passwordUpdateForm: PropTypes.object.isRequired,
|
passwordUpdateForm: PropTypes.object.isRequired,
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import Item from './Item';
|
|||||||
const UsersModal = React.memo(
|
const UsersModal = React.memo(
|
||||||
({
|
({
|
||||||
items,
|
items,
|
||||||
|
canAdd,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
onUsernameUpdate,
|
onUsernameUpdate,
|
||||||
onUsernameUpdateMessageDismiss,
|
onUsernameUpdateMessageDismiss,
|
||||||
@@ -110,6 +111,10 @@ const UsersModal = React.memo(
|
|||||||
organization={item.organization}
|
organization={item.organization}
|
||||||
phone={item.phone}
|
phone={item.phone}
|
||||||
isAdmin={item.isAdmin}
|
isAdmin={item.isAdmin}
|
||||||
|
isLocked={item.isLocked}
|
||||||
|
isRoleLocked={item.isRoleLocked}
|
||||||
|
isUsernameLocked={item.isUsernameLocked}
|
||||||
|
isDeletionLocked={item.isDeletionLocked}
|
||||||
emailUpdateForm={item.emailUpdateForm}
|
emailUpdateForm={item.emailUpdateForm}
|
||||||
passwordUpdateForm={item.passwordUpdateForm}
|
passwordUpdateForm={item.passwordUpdateForm}
|
||||||
usernameUpdateForm={item.usernameUpdateForm}
|
usernameUpdateForm={item.usernameUpdateForm}
|
||||||
@@ -126,11 +131,13 @@ const UsersModal = React.memo(
|
|||||||
</Table.Body>
|
</Table.Body>
|
||||||
</Table>
|
</Table>
|
||||||
</Modal.Content>
|
</Modal.Content>
|
||||||
<Modal.Actions>
|
{canAdd && (
|
||||||
<UserAddPopupContainer>
|
<Modal.Actions>
|
||||||
<Button positive content={t('action.addUser')} />
|
<UserAddPopupContainer>
|
||||||
</UserAddPopupContainer>
|
<Button positive content={t('action.addUser')} />
|
||||||
</Modal.Actions>
|
</UserAddPopupContainer>
|
||||||
|
</Modal.Actions>
|
||||||
|
)}
|
||||||
</Modal>
|
</Modal>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -138,6 +145,7 @@ const UsersModal = React.memo(
|
|||||||
|
|
||||||
UsersModal.propTypes = {
|
UsersModal.propTypes = {
|
||||||
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
canAdd: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onUsernameUpdate: PropTypes.func.isRequired,
|
onUsernameUpdate: PropTypes.func.isRequired,
|
||||||
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
|
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -12,14 +12,19 @@ export default {
|
|||||||
|
|
||||||
/* Login */
|
/* Login */
|
||||||
|
|
||||||
|
LOGIN_INITIALIZE: 'LOGIN_INITIALIZE',
|
||||||
AUTHENTICATE: 'AUTHENTICATE',
|
AUTHENTICATE: 'AUTHENTICATE',
|
||||||
AUTHENTICATE__SUCCESS: 'AUTHENTICATE__SUCCESS',
|
AUTHENTICATE__SUCCESS: 'AUTHENTICATE__SUCCESS',
|
||||||
AUTHENTICATE__FAILURE: 'AUTHENTICATE__FAILURE',
|
AUTHENTICATE__FAILURE: 'AUTHENTICATE__FAILURE',
|
||||||
|
USING_OIDC_AUTHENTICATE: 'USING_OIDC_AUTHENTICATE',
|
||||||
|
USING_OIDC_AUTHENTICATE__SUCCESS: 'USING_OIDC_AUTHENTICATE__SUCCESS',
|
||||||
|
USING_OIDC_AUTHENTICATE__FAILURE: 'USING_OIDC_AUTHENTICATE__FAILURE',
|
||||||
AUTHENTICATE_ERROR_CLEAR: 'AUTHENTICATE_ERROR_CLEAR',
|
AUTHENTICATE_ERROR_CLEAR: 'AUTHENTICATE_ERROR_CLEAR',
|
||||||
|
|
||||||
/* Core */
|
/* Core */
|
||||||
|
|
||||||
CORE_INITIALIZE: 'CORE_INITIALIZE',
|
CORE_INITIALIZE: 'CORE_INITIALIZE',
|
||||||
|
CORE_INITIALIZE__CONFIG_FETCH: 'CORE_INITIALIZE__CONFIG_FETCH',
|
||||||
LOGOUT: 'LOGOUT',
|
LOGOUT: 'LOGOUT',
|
||||||
LOGOUT__ACCESS_TOKEN_INVALIDATE: 'LOGOUT__ACCESS_TOKEN_INVALIDATE',
|
LOGOUT__ACCESS_TOKEN_INVALIDATE: 'LOGOUT__ACCESS_TOKEN_INVALIDATE',
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ export default {
|
|||||||
/* Login */
|
/* Login */
|
||||||
|
|
||||||
AUTHENTICATE: `${PREFIX}/AUTHENTICATE`,
|
AUTHENTICATE: `${PREFIX}/AUTHENTICATE`,
|
||||||
|
USING_OIDC_AUTHENTICATE: `${PREFIX}/USING_OIDC_AUTHENTICATE`,
|
||||||
AUTHENTICATE_ERROR_CLEAR: `${PREFIX}/AUTHENTICATE_ERROR_CLEAR`,
|
AUTHENTICATE_ERROR_CLEAR: `${PREFIX}/AUTHENTICATE_ERROR_CLEAR`,
|
||||||
|
|
||||||
/* Core */
|
/* Core */
|
||||||
|
|
||||||
CORE_INITIALIZE: `${PREFIX}/CORE_INITIALIZE`,
|
|
||||||
LOGOUT: `${PREFIX}/LOGOUT`,
|
LOGOUT: `${PREFIX}/LOGOUT`,
|
||||||
|
|
||||||
/* Modals */
|
/* Modals */
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import Config from './Config';
|
|||||||
|
|
||||||
const ROOT = `${Config.BASE_PATH}/`;
|
const ROOT = `${Config.BASE_PATH}/`;
|
||||||
const LOGIN = `${Config.BASE_PATH}/login`;
|
const LOGIN = `${Config.BASE_PATH}/login`;
|
||||||
|
const OIDC_CALLBACK = `${Config.BASE_PATH}/oidc-callback`;
|
||||||
const PROJECTS = `${Config.BASE_PATH}/projects/:id`;
|
const PROJECTS = `${Config.BASE_PATH}/projects/:id`;
|
||||||
const BOARDS = `${Config.BASE_PATH}/boards/:id`;
|
const BOARDS = `${Config.BASE_PATH}/boards/:id`;
|
||||||
const CARDS = `${Config.BASE_PATH}/cards/:id`;
|
const CARDS = `${Config.BASE_PATH}/cards/:id`;
|
||||||
@@ -9,6 +10,7 @@ const CARDS = `${Config.BASE_PATH}/cards/:id`;
|
|||||||
export default {
|
export default {
|
||||||
ROOT,
|
ROOT,
|
||||||
LOGIN,
|
LOGIN,
|
||||||
|
OIDC_CALLBACK,
|
||||||
PROJECTS,
|
PROJECTS,
|
||||||
BOARDS,
|
BOARDS,
|
||||||
CARDS,
|
CARDS,
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const makeMapStateToProps = () => {
|
|||||||
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
||||||
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const { name, dueDate, timer, coverUrl, boardId, listId, isPersisted } = selectCardById(
|
const { name, dueDate, stopwatch, coverUrl, boardId, listId, isPersisted } = selectCardById(
|
||||||
state,
|
state,
|
||||||
id,
|
id,
|
||||||
);
|
);
|
||||||
@@ -38,7 +38,7 @@ const makeMapStateToProps = () => {
|
|||||||
index,
|
index,
|
||||||
name,
|
name,
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
stopwatch,
|
||||||
coverUrl,
|
coverUrl,
|
||||||
boardId,
|
boardId,
|
||||||
listId,
|
listId,
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ const mapStateToProps = (state) => {
|
|||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
stopwatch,
|
||||||
isSubscribed,
|
isSubscribed,
|
||||||
isActivitiesFetching,
|
isActivitiesFetching,
|
||||||
isAllActivitiesFetched,
|
isAllActivitiesFetched,
|
||||||
@@ -49,7 +49,7 @@ const mapStateToProps = (state) => {
|
|||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
timer,
|
stopwatch,
|
||||||
isSubscribed,
|
isSubscribed,
|
||||||
isActivitiesFetching,
|
isActivitiesFetching,
|
||||||
isAllActivitiesFetched,
|
isAllActivitiesFetched,
|
||||||
|
|||||||
@@ -4,18 +4,18 @@ import selectors from '../selectors';
|
|||||||
import Core from '../components/Core';
|
import Core from '../components/Core';
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
const isCoreInitializing = selectors.selectIsCoreInitializing(state);
|
const isInitializing = selectors.selectIsInitializing(state);
|
||||||
const isSocketDisconnected = selectors.selectIsSocketDisconnected(state);
|
const isSocketDisconnected = selectors.selectIsSocketDisconnected(state);
|
||||||
const currentModal = selectors.selectCurrentModal(state);
|
const currentModal = selectors.selectCurrentModal(state);
|
||||||
const currentProject = selectors.selectCurrentProject(state);
|
const currentProject = selectors.selectCurrentProject(state);
|
||||||
const currentBoard = selectors.selectCurrentBoard(state);
|
const currentBoard = selectors.selectCurrentBoard(state);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
isInitializing,
|
||||||
isSocketDisconnected,
|
isSocketDisconnected,
|
||||||
currentModal,
|
currentModal,
|
||||||
currentProject,
|
currentProject,
|
||||||
currentBoard,
|
currentBoard,
|
||||||
isInitializing: isCoreInitializing,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,23 +1,34 @@
|
|||||||
import { bindActionCreators } from 'redux';
|
import { bindActionCreators } from 'redux';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
import selectors from '../selectors';
|
||||||
import entryActions from '../entry-actions';
|
import entryActions from '../entry-actions';
|
||||||
import Login from '../components/Login';
|
import Login from '../components/Login';
|
||||||
|
|
||||||
const mapStateToProps = ({
|
const mapStateToProps = (state) => {
|
||||||
ui: {
|
const oidcConfig = selectors.selectOidcConfig(state);
|
||||||
authenticateForm: { data: defaultData, isSubmitting, error },
|
|
||||||
},
|
const {
|
||||||
}) => ({
|
ui: {
|
||||||
defaultData,
|
authenticateForm: { data: defaultData, isSubmitting, isSubmittingUsingOidc, error },
|
||||||
isSubmitting,
|
},
|
||||||
error,
|
} = state;
|
||||||
});
|
|
||||||
|
return {
|
||||||
|
defaultData,
|
||||||
|
isSubmitting,
|
||||||
|
isSubmittingUsingOidc,
|
||||||
|
error,
|
||||||
|
withOidc: !!oidcConfig,
|
||||||
|
isOidcEnforced: oidcConfig && oidcConfig.isEnforced,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
const mapDispatchToProps = (dispatch) =>
|
const mapDispatchToProps = (dispatch) =>
|
||||||
bindActionCreators(
|
bindActionCreators(
|
||||||
{
|
{
|
||||||
onAuthenticate: entryActions.authenticate,
|
onAuthenticate: entryActions.authenticate,
|
||||||
|
onAuthenticateUsingOidc: entryActions.authenticateUsingOidc,
|
||||||
onMessageDismiss: entryActions.clearAuthenticateError,
|
onMessageDismiss: entryActions.clearAuthenticateError,
|
||||||
},
|
},
|
||||||
dispatch,
|
dispatch,
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
import selectors from '../selectors';
|
||||||
|
import LoginWrapper from '../components/LoginWrapper';
|
||||||
|
|
||||||
|
const mapStateToProps = (state) => {
|
||||||
|
const isInitializing = selectors.selectIsInitializing(state);
|
||||||
|
|
||||||
|
return {
|
||||||
|
isInitializing,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(LoginWrapper);
|
||||||
@@ -15,6 +15,8 @@ const mapStateToProps = (state) => {
|
|||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
subscribeToOwnCards,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
@@ -30,6 +32,8 @@ const mapStateToProps = (state) => {
|
|||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
subscribeToOwnCards,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
|
|||||||
@@ -6,10 +6,12 @@ import entryActions from '../entry-actions';
|
|||||||
import UsersModal from '../components/UsersModal';
|
import UsersModal from '../components/UsersModal';
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
|
const oidcConfig = selectors.selectOidcConfig(state);
|
||||||
const users = selectors.selectUsersExceptCurrent(state);
|
const users = selectors.selectUsersExceptCurrent(state);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
items: users,
|
items: users,
|
||||||
|
canAdd: !oidcConfig || !oidcConfig.isEnforced,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,10 @@
|
|||||||
import EntryActionTypes from '../constants/EntryActionTypes';
|
import EntryActionTypes from '../constants/EntryActionTypes';
|
||||||
|
|
||||||
const initializeCore = () => ({
|
|
||||||
type: EntryActionTypes.CORE_INITIALIZE,
|
|
||||||
payload: {},
|
|
||||||
});
|
|
||||||
|
|
||||||
const logout = () => ({
|
const logout = () => ({
|
||||||
type: EntryActionTypes.LOGOUT,
|
type: EntryActionTypes.LOGOUT,
|
||||||
payload: {},
|
payload: {},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
initializeCore,
|
|
||||||
logout,
|
logout,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,6 +7,11 @@ const authenticate = (data) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const authenticateUsingOidc = () => ({
|
||||||
|
type: EntryActionTypes.USING_OIDC_AUTHENTICATE,
|
||||||
|
payload: {},
|
||||||
|
});
|
||||||
|
|
||||||
const clearAuthenticateError = () => ({
|
const clearAuthenticateError = () => ({
|
||||||
type: EntryActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
type: EntryActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
||||||
payload: {},
|
payload: {},
|
||||||
@@ -14,5 +19,6 @@ const clearAuthenticateError = () => ({
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
authenticate,
|
authenticate,
|
||||||
|
authenticateUsingOidc,
|
||||||
clearAuthenticateError,
|
clearAuthenticateError,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,10 +9,13 @@ export default {
|
|||||||
dateTime: '$t(format:date) $t(format:time)',
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
longDate: 'd MMM',
|
longDate: 'd MMM',
|
||||||
longDateTime: "d MMMM 'v' p",
|
longDateTime: "d MMMM 'v' p",
|
||||||
|
fullDate: 'd MMM, y',
|
||||||
|
fullDateTime: "d MMMM, y 'v' p",
|
||||||
},
|
},
|
||||||
|
|
||||||
translation: {
|
translation: {
|
||||||
common: {
|
common: {
|
||||||
|
aboutPlanka: 'O aplikaci Planka',
|
||||||
account: 'Účet',
|
account: 'Účet',
|
||||||
actions: 'Akce',
|
actions: 'Akce',
|
||||||
addAttachment_title: 'Přidat přílohu',
|
addAttachment_title: 'Přidat přílohu',
|
||||||
@@ -23,7 +26,7 @@ export default {
|
|||||||
administrator: 'Administrátor',
|
administrator: 'Administrátor',
|
||||||
all: 'Vše',
|
all: 'Vše',
|
||||||
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
'Všechny změny budou automaticky uloženy<br />po obnově spojení',
|
'Všechny změny budou automaticky uloženy<br />po obnově spojení.',
|
||||||
areYouSureYouWantToDeleteThisAttachment: 'Opravdu chcete smazat tuto přílohu?',
|
areYouSureYouWantToDeleteThisAttachment: 'Opravdu chcete smazat tuto přílohu?',
|
||||||
areYouSureYouWantToDeleteThisBoard: 'Opravdu chcete smazat tuto tabuli?',
|
areYouSureYouWantToDeleteThisBoard: 'Opravdu chcete smazat tuto tabuli?',
|
||||||
areYouSureYouWantToDeleteThisCard: 'Opravdu chcete smazat tuto kartu?',
|
areYouSureYouWantToDeleteThisCard: 'Opravdu chcete smazat tuto kartu?',
|
||||||
@@ -45,13 +48,16 @@ export default {
|
|||||||
background: 'Pozadí',
|
background: 'Pozadí',
|
||||||
board: 'Tabule',
|
board: 'Tabule',
|
||||||
boardNotFound_title: 'Tabule nenalezena',
|
boardNotFound_title: 'Tabule nenalezena',
|
||||||
|
canComment: 'Může komentovat',
|
||||||
|
canEditContentOfBoard: 'Může upravovat obsah tabule.',
|
||||||
|
canOnlyViewBoard: 'Může zobrazit pouze tabuli.',
|
||||||
cardActions_title: 'Akce na kartě',
|
cardActions_title: 'Akce na kartě',
|
||||||
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',
|
||||||
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í.',
|
||||||
createProject_title: 'Vytvořit projekt',
|
createProject_title: 'Vytvořit projekt',
|
||||||
createTextFile_title: 'Vytvořit textový soubor',
|
createTextFile_title: 'Vytvořit textový soubor',
|
||||||
currentPassword: 'Aktuální heslo',
|
currentPassword: 'Aktuální heslo',
|
||||||
@@ -68,15 +74,19 @@ export default {
|
|||||||
deleteTask_title: 'Smazat úkol',
|
deleteTask_title: 'Smazat úkol',
|
||||||
deleteUser_title: 'Smazat uživatele',
|
deleteUser_title: 'Smazat uživatele',
|
||||||
description: 'Popis',
|
description: 'Popis',
|
||||||
|
detectAutomatically: 'Automatická detekce',
|
||||||
dropFileToUpload: 'Přetáhnutím nahraj soubor',
|
dropFileToUpload: 'Přetáhnutím nahraj soubor',
|
||||||
|
editor: 'Editor',
|
||||||
editAttachment_title: 'Upravit přílohu',
|
editAttachment_title: 'Upravit přílohu',
|
||||||
editAvatar_title: 'Upravit avatar',
|
editAvatar_title: 'Upravit avatar',
|
||||||
editBoard_title: 'Upravit tabuli',
|
editBoard_title: 'Upravit tabuli',
|
||||||
editDueDate_title: 'Upravit Termín do',
|
editDueDate_title: 'Upravit Termín do',
|
||||||
editEmail_title: 'Upravit e-mail',
|
editEmail_title: 'Upravit e-mail',
|
||||||
|
editInformation_title: 'Upravit informace',
|
||||||
editLabel_title: 'Upravit štítek',
|
editLabel_title: 'Upravit štítek',
|
||||||
editPassword_title: 'Upravit heslo',
|
editPassword_title: 'Upravit heslo',
|
||||||
editTimer_title: 'Upravit časovač',
|
editPermissions_title: 'Upravit oprávnění',
|
||||||
|
editStopwatch_title: 'Upravit časovač',
|
||||||
editUsername_title: 'Upravit uživatelské jméno',
|
editUsername_title: 'Upravit uživatelské jméno',
|
||||||
email: 'E-mail',
|
email: 'E-mail',
|
||||||
emailAlreadyInUse: 'E-mail se již používá',
|
emailAlreadyInUse: 'E-mail se již používá',
|
||||||
@@ -89,10 +99,13 @@ export default {
|
|||||||
filterByLabels_title: 'Filtruj podle štítku',
|
filterByLabels_title: 'Filtruj podle štítku',
|
||||||
filterByMembers_title: 'Filtruj podle člena',
|
filterByMembers_title: 'Filtruj podle člena',
|
||||||
fromComputer_title: 'Z počítače',
|
fromComputer_title: 'Z počítače',
|
||||||
|
fromTrello: 'Z Trella',
|
||||||
general: 'Obecné',
|
general: 'Obecné',
|
||||||
hours: 'Hodiny',
|
hours: 'Hodiny',
|
||||||
|
importBoard_title: 'Importovat tabuli',
|
||||||
invalidCurrentPassword: 'Neplatné aktuální heslo',
|
invalidCurrentPassword: 'Neplatné aktuální heslo',
|
||||||
labels: 'Štítky',
|
labels: 'Štítky',
|
||||||
|
language: 'Jazyk',
|
||||||
leaveBoard_title: 'Opustit tabuli',
|
leaveBoard_title: 'Opustit tabuli',
|
||||||
leaveProject_title: 'Opustit projekt',
|
leaveProject_title: 'Opustit projekt',
|
||||||
list: 'Seznam',
|
list: 'Seznam',
|
||||||
@@ -117,21 +130,26 @@ 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: dejte Ctrl-V (Cmd-V na Mac) pro vložení přílohy 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',
|
||||||
removeMember_title: 'Odstranit člena',
|
removeMember_title: 'Odstranit člena',
|
||||||
|
searchLabels: 'Hledat štítky...',
|
||||||
|
searchMembers: 'Hledat členy...',
|
||||||
|
searchUsers: 'Hledat uživatele...',
|
||||||
seconds: 'Vteřin',
|
seconds: 'Vteřin',
|
||||||
selectBoard: 'Vybrat tabuli',
|
selectBoard: 'Vybrat tabuli',
|
||||||
selectList: 'Vybrat seznam',
|
selectList: 'Vybrat seznam',
|
||||||
|
selectPermissions_title: 'Vybrat oprávnění',
|
||||||
selectProject: 'Vybrat projekt',
|
selectProject: 'Vybrat projekt',
|
||||||
settings: 'Nastavení',
|
settings: 'Nastavení',
|
||||||
|
stopwatch: 'Časovač',
|
||||||
subscribeToMyOwnCardsByDefault: 'Ve výchozím nastavení odebírat vlastní karty',
|
subscribeToMyOwnCardsByDefault: 'Ve výchozím nastavení odebírat vlastní karty',
|
||||||
taskActions_title: 'Akce na úkolu',
|
taskActions_title: 'Akce na úkolu',
|
||||||
tasks: 'Úkoly',
|
tasks: 'Úkoly',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment: 'Pro tuto přílohu není k dispozici žádný náhled.',
|
||||||
time: 'Čas',
|
time: 'Čas',
|
||||||
timer: 'Časovač',
|
|
||||||
title: 'Titulek',
|
title: 'Titulek',
|
||||||
userActions_title: 'Akce na uživateli',
|
userActions_title: 'Akce na uživateli',
|
||||||
userAddedThisCardToList: '<0>{{user}}</0><1> přidal kartu do {{list}}</1>',
|
userAddedThisCardToList: '<0>{{user}}</0><1> přidal kartu do {{list}}</1>',
|
||||||
@@ -142,6 +160,8 @@ export default {
|
|||||||
username: 'Uživatelské jméno',
|
username: 'Uživatelské jméno',
|
||||||
usernameAlreadyInUse: 'Uživatelské jméno se již používá',
|
usernameAlreadyInUse: 'Uživatelské jméno se již používá',
|
||||||
users: 'Uživatelé',
|
users: 'Uživatelé',
|
||||||
|
version: 'Verze',
|
||||||
|
viewer: 'Prohlížeč',
|
||||||
writeComment: 'Napsat komentář...',
|
writeComment: 'Napsat komentář...',
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -153,6 +173,7 @@ export default {
|
|||||||
addCard_title: 'Přidat kartu',
|
addCard_title: 'Přidat kartu',
|
||||||
addComment: 'Přidat komentář',
|
addComment: 'Přidat komentář',
|
||||||
addList: 'Přidat seznam',
|
addList: 'Přidat seznam',
|
||||||
|
addMember: 'Přidat člena',
|
||||||
addMoreDetailedDescription: 'Přidat další detailní popis',
|
addMoreDetailedDescription: 'Přidat další detailní popis',
|
||||||
addTask: 'Přidat úkol',
|
addTask: 'Přidat úkol',
|
||||||
addToCard: 'Přidat na kartu',
|
addToCard: 'Přidat na kartu',
|
||||||
@@ -182,10 +203,14 @@ export default {
|
|||||||
editDueDate_title: 'Upravit termín do',
|
editDueDate_title: 'Upravit termín do',
|
||||||
editDescription_title: 'Upravit popis',
|
editDescription_title: 'Upravit popis',
|
||||||
editEmail_title: 'Upravit e-mail',
|
editEmail_title: 'Upravit e-mail',
|
||||||
|
editInformation_title: 'Upravit informace',
|
||||||
editPassword_title: 'Upravit heslo',
|
editPassword_title: 'Upravit heslo',
|
||||||
editTimer_title: 'Upravit časovač',
|
editPermissions: 'Upravit oprávnění',
|
||||||
|
editStopwatch_title: 'Upravit časovač',
|
||||||
editTitle_title: 'Upravit titulek',
|
editTitle_title: 'Upravit titulek',
|
||||||
editUsername_title: 'Upravit uživatelské jméno',
|
editUsername_title: 'Upravit uživatelské jméno',
|
||||||
|
hideDetails: 'Skrýt detaily',
|
||||||
|
import: 'Import',
|
||||||
leaveBoard: 'Opustit tabuli',
|
leaveBoard: 'Opustit tabuli',
|
||||||
leaveProject: 'Opustit projekt',
|
leaveProject: 'Opustit projekt',
|
||||||
logOut_title: 'Odhlásit se',
|
logOut_title: 'Odhlásit se',
|
||||||
@@ -202,6 +227,7 @@ export default {
|
|||||||
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',
|
showFewerAttachments: 'Zobrazit méně příloh',
|
||||||
|
showDetails: 'Zobrazit detaily',
|
||||||
start: 'Start',
|
start: 'Start',
|
||||||
stop: 'Stop',
|
stop: 'Stop',
|
||||||
subscribe: 'Odebírat',
|
subscribe: 'Odebírat',
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ export default {
|
|||||||
dateTime: '$t(format:date) $t(format:time)',
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
longDate: 'MMM d',
|
longDate: 'MMM d',
|
||||||
longDateTime: "MMMM d 'at' p",
|
longDateTime: "MMMM d 'at' p",
|
||||||
|
fullDate: 'MMM d, y',
|
||||||
|
fullDateTime: "MMMM d, y 'a' p",
|
||||||
},
|
},
|
||||||
|
|
||||||
translation: {
|
translation: {
|
||||||
@@ -23,7 +25,7 @@ export default {
|
|||||||
administrator: 'Administrator',
|
administrator: 'Administrator',
|
||||||
all: 'Alle',
|
all: 'Alle',
|
||||||
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
'Alle ændringer vil automatisk blive gemt<br />ved genforbindelse',
|
'Alle ændringer vil automatisk blive gemt<br />ved genforbindelse.',
|
||||||
areYouSureYouWantToDeleteThisAttachment: 'Vil du slette den vedhæftede fil?',
|
areYouSureYouWantToDeleteThisAttachment: 'Vil du slette den vedhæftede fil?',
|
||||||
areYouSureYouWantToDeleteThisBoard: 'Vil du slette dette bræt?',
|
areYouSureYouWantToDeleteThisBoard: 'Vil du slette dette bræt?',
|
||||||
areYouSureYouWantToDeleteThisCard: 'Vil du slette dette kort?',
|
areYouSureYouWantToDeleteThisCard: 'Vil du slette dette kort?',
|
||||||
@@ -46,11 +48,11 @@ export default {
|
|||||||
boardNotFound_title: 'Bræt ikke fundet',
|
boardNotFound_title: 'Bræt ikke fundet',
|
||||||
cardActions_title: 'Korthandlinger',
|
cardActions_title: 'Korthandlinger',
|
||||||
cardNotFound_title: 'Kort ikke fundet',
|
cardNotFound_title: 'Kort ikke fundet',
|
||||||
cardOrActionAreDeleted: 'Kort eller handling er slettet',
|
cardOrActionAreDeleted: 'Kort eller handling er slettet.',
|
||||||
color: 'Farve',
|
color: 'Farve',
|
||||||
createBoard_title: 'Opret bræt',
|
createBoard_title: 'Opret bræt',
|
||||||
createLabel_title: 'Opret mærkat',
|
createLabel_title: 'Opret mærkat',
|
||||||
createNewOneOrSelectExistingOne: 'Lav en ny eller marker<br />en eksisterende',
|
createNewOneOrSelectExistingOne: 'Lav en ny eller marker<br />en eksisterende.',
|
||||||
createProject_title: 'Opret projekt',
|
createProject_title: 'Opret projekt',
|
||||||
createTextFile_title: 'Opret tekstfil',
|
createTextFile_title: 'Opret tekstfil',
|
||||||
currentPassword: 'Nuværende løsen',
|
currentPassword: 'Nuværende løsen',
|
||||||
@@ -75,7 +77,7 @@ export default {
|
|||||||
editEmail_title: 'Ændre E-mail',
|
editEmail_title: 'Ændre E-mail',
|
||||||
editLabel_title: 'ændre mærkat',
|
editLabel_title: 'ændre mærkat',
|
||||||
editPassword_title: 'Ændre løsen',
|
editPassword_title: 'Ændre løsen',
|
||||||
editTimer_title: 'Ændre timer',
|
editStopwatch_title: 'Ændre timer',
|
||||||
editUsername_title: 'Ændre brugernavn',
|
editUsername_title: 'Ændre brugernavn',
|
||||||
email: 'E-mail',
|
email: 'E-mail',
|
||||||
emailAlreadyInUse: 'E-mail allerede i brug',
|
emailAlreadyInUse: 'E-mail allerede i brug',
|
||||||
@@ -109,14 +111,14 @@ export default {
|
|||||||
noLists: 'Ingen lister',
|
noLists: 'Ingen lister',
|
||||||
noProjects: 'Ingen projekter',
|
noProjects: 'Ingen projekter',
|
||||||
notifications: 'Notifikationer',
|
notifications: 'Notifikationer',
|
||||||
noUnreadNotifications: 'Ingen ulæste notifikationer',
|
noUnreadNotifications: 'Ingen ulæste notifikationer.',
|
||||||
openBoard_title: 'Åben bræt',
|
openBoard_title: 'Åben bræt',
|
||||||
optional_inline: 'valgfri',
|
optional_inline: 'valgfri',
|
||||||
organization: 'Organisation',
|
organization: 'Organisation',
|
||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Præferencer',
|
preferences: 'Præferencer',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: Tryk Ctrl-V (Cmd-V på Mac) for at vedhæfte direkte fra udklipsholder',
|
'Tip: Tryk Ctrl-V (Cmd-V på Mac) for at vedhæfte direkte fra udklipsholder.',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt ej fundet',
|
projectNotFound_title: 'Projekt ej fundet',
|
||||||
removeManager_title: 'Fjern projektleder',
|
removeManager_title: 'Fjern projektleder',
|
||||||
@@ -126,11 +128,11 @@ export default {
|
|||||||
selectList: 'Vælg liste',
|
selectList: 'Vælg liste',
|
||||||
selectProject: 'Vælg projekt',
|
selectProject: 'Vælg projekt',
|
||||||
settings: 'Indstillinger',
|
settings: 'Indstillinger',
|
||||||
|
stopwatch: 'Tidsmåler',
|
||||||
subscribeToMyOwnCardsByDefault: 'Abonnér på egne kort som standard',
|
subscribeToMyOwnCardsByDefault: 'Abonnér på egne kort som standard',
|
||||||
taskActions_title: 'Opgave handlinger',
|
taskActions_title: 'Opgave handlinger',
|
||||||
tasks: 'Opgaver',
|
tasks: 'Opgaver',
|
||||||
time: 'Tid',
|
time: 'Tid',
|
||||||
timer: 'Tidsmåler',
|
|
||||||
title: 'Overskrift',
|
title: 'Overskrift',
|
||||||
userActions_title: 'Brugerhandlinger',
|
userActions_title: 'Brugerhandlinger',
|
||||||
userAddedThisCardToList: '<0>{{user}}</0><1> tilføjede kortet til {{list}}</1>',
|
userAddedThisCardToList: '<0>{{user}}</0><1> tilføjede kortet til {{list}}</1>',
|
||||||
@@ -183,7 +185,7 @@ export default {
|
|||||||
editDescription_title: 'Ændre beskrivelse',
|
editDescription_title: 'Ændre beskrivelse',
|
||||||
editEmail_title: 'Ændre e-mail',
|
editEmail_title: 'Ændre e-mail',
|
||||||
editPassword_title: 'Ændre Løsen',
|
editPassword_title: 'Ændre Løsen',
|
||||||
editTimer_title: 'Ændre tidstager',
|
editStopwatch_title: 'Ændre tidstager',
|
||||||
editTitle_title: 'Ændre overskrift',
|
editTitle_title: 'Ændre overskrift',
|
||||||
editUsername_title: 'Ændre brugernavn',
|
editUsername_title: 'Ændre brugernavn',
|
||||||
leaveBoard: 'Forlad bræt',
|
leaveBoard: 'Forlad bræt',
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ export default {
|
|||||||
dateTime: '$t(format:date) $t(format:time)',
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
longDate: 'd. MMM',
|
longDate: 'd. MMM',
|
||||||
longDateTime: "d. MMMM 'um' p",
|
longDateTime: "d. MMMM 'um' p",
|
||||||
|
fullDate: 'd. MMM. y',
|
||||||
|
fullDateTime: "d. MMMM. y 'um' p",
|
||||||
},
|
},
|
||||||
|
|
||||||
translation: {
|
translation: {
|
||||||
@@ -51,7 +53,7 @@ export default {
|
|||||||
boardNotFound_title: 'Board nicht gefunden',
|
boardNotFound_title: 'Board nicht gefunden',
|
||||||
cardActions_title: 'Kartenaktionen',
|
cardActions_title: 'Kartenaktionen',
|
||||||
cardNotFound_title: 'Karte nicht gefunden',
|
cardNotFound_title: 'Karte nicht gefunden',
|
||||||
cardOrActionAreDeleted: 'Karte oder Aktion wurden gelöscht',
|
cardOrActionAreDeleted: 'Karte oder Aktion wurden gelöscht.',
|
||||||
color: 'Farbe',
|
color: 'Farbe',
|
||||||
createBoard_title: 'Board erstellen',
|
createBoard_title: 'Board erstellen',
|
||||||
createLabel_title: 'Label erstellen',
|
createLabel_title: 'Label erstellen',
|
||||||
@@ -82,7 +84,7 @@ export default {
|
|||||||
editEmail_title: 'E-Mail-Adresse bearbeiten',
|
editEmail_title: 'E-Mail-Adresse bearbeiten',
|
||||||
editLabel_title: 'Label bearbeiten',
|
editLabel_title: 'Label bearbeiten',
|
||||||
editPassword_title: 'Passwort ändern',
|
editPassword_title: 'Passwort ändern',
|
||||||
editTimer_title: 'Timer bearbeiten',
|
editStopwatch_title: 'Stoppuhr bearbeiten',
|
||||||
editUsername_title: 'Benutzername ändern',
|
editUsername_title: 'Benutzername ändern',
|
||||||
email: 'E-Mail-Adresse',
|
email: 'E-Mail-Adresse',
|
||||||
emailAlreadyInUse: 'E-Mail-Adresse bereits in Verwendung',
|
emailAlreadyInUse: 'E-Mail-Adresse bereits in Verwendung',
|
||||||
@@ -117,14 +119,14 @@ export default {
|
|||||||
noLists: 'Keine Listen',
|
noLists: 'Keine Listen',
|
||||||
noProjects: 'Keine Projekte',
|
noProjects: 'Keine Projekte',
|
||||||
notifications: 'Benachrichtigungen',
|
notifications: 'Benachrichtigungen',
|
||||||
noUnreadNotifications: 'Keine ungelesenen Benachrichtigungen',
|
noUnreadNotifications: 'Keine ungelesenen Benachrichtigungen.',
|
||||||
openBoard_title: 'Board öffnen',
|
openBoard_title: 'Board öffnen',
|
||||||
optional_inline: 'Optional',
|
optional_inline: 'Optional',
|
||||||
organization: 'Organisation',
|
organization: 'Organisation',
|
||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Voreinstellungen',
|
preferences: 'Voreinstellungen',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tipp: Drücken Sie STRG-V (Cmd-V auf Mac), um einen Anhang aus der Zwischenablage hinzuzufügen',
|
'Tipp: Drücken Sie STRG-V (Cmd-V auf Mac), um einen Anhang aus der Zwischenablage hinzuzufügen.',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt nicht gefunden',
|
projectNotFound_title: 'Projekt nicht gefunden',
|
||||||
removeManager_title: 'Manager entfernen',
|
removeManager_title: 'Manager entfernen',
|
||||||
@@ -134,12 +136,12 @@ export default {
|
|||||||
selectList: 'Liste auswählen',
|
selectList: 'Liste auswählen',
|
||||||
selectProject: 'Projekt auswählen',
|
selectProject: 'Projekt auswählen',
|
||||||
settings: 'Einstellungen',
|
settings: 'Einstellungen',
|
||||||
|
stopwatch: 'Stoppuhr',
|
||||||
subscribeToMyOwnCardsByDefault: 'Standardmäßig meine eigenen Karten abonnieren',
|
subscribeToMyOwnCardsByDefault: 'Standardmäßig meine eigenen Karten abonnieren',
|
||||||
taskActions_title: 'Aufgabenaktionen',
|
taskActions_title: 'Aufgabenaktionen',
|
||||||
tasks: 'Aufgaben',
|
tasks: 'Aufgaben',
|
||||||
thereIsNoPreviewAvailableForThisAttachment: 'Für diesen Anhang ist keine Vorschau verfügbar',
|
thereIsNoPreviewAvailableForThisAttachment: 'Für diesen Anhang ist keine Vorschau verfügbar',
|
||||||
time: 'Zeit',
|
time: 'Zeit',
|
||||||
timer: 'Timer',
|
|
||||||
title: 'Titel',
|
title: 'Titel',
|
||||||
userActions_title: 'Benutzeraktionen',
|
userActions_title: 'Benutzeraktionen',
|
||||||
userAddedThisCardToList: '<0>{{user}}</0><1> hat diese Karte hinzugefügt zu {{list}}</1>',
|
userAddedThisCardToList: '<0>{{user}}</0><1> hat diese Karte hinzugefügt zu {{list}}</1>',
|
||||||
@@ -193,7 +195,7 @@ export default {
|
|||||||
editDescription_title: 'Beschreibung ändern',
|
editDescription_title: 'Beschreibung ändern',
|
||||||
editEmail_title: 'E-Mail-Adresse bearbeiten',
|
editEmail_title: 'E-Mail-Adresse bearbeiten',
|
||||||
editPassword_title: 'Passwort ändern',
|
editPassword_title: 'Passwort ändern',
|
||||||
editTimer_title: 'Timer bearbeiten',
|
editStopwatch_title: 'Stoppuhr bearbeiten',
|
||||||
editTitle_title: 'Titel bearbeiten',
|
editTitle_title: 'Titel bearbeiten',
|
||||||
editUsername_title: 'Benutzername ändern',
|
editUsername_title: 'Benutzername ändern',
|
||||||
hideDetails: 'Details ausblenden',
|
hideDetails: 'Details ausblenden',
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ export default {
|
|||||||
dateTime: '$t(format:date) $t(format:time)',
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
longDate: 'MMM d',
|
longDate: 'MMM d',
|
||||||
longDateTime: "MMMM d 'at' p",
|
longDateTime: "MMMM d 'at' p",
|
||||||
|
fullDate: 'MMM d, y',
|
||||||
|
fullDateTime: "MMMM d, y 'at' p",
|
||||||
},
|
},
|
||||||
|
|
||||||
translation: {
|
translation: {
|
||||||
@@ -20,7 +22,7 @@ export default {
|
|||||||
administrator: 'Administrator',
|
administrator: 'Administrator',
|
||||||
all: 'All',
|
all: 'All',
|
||||||
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
'All changes will be automatically saved<br />after connection restored',
|
'All changes will be automatically saved<br />after connection restored.',
|
||||||
areYouSureYouWantToDeleteThisAttachment: 'Are you sure you want to delete this attachment?',
|
areYouSureYouWantToDeleteThisAttachment: 'Are you sure you want to delete this attachment?',
|
||||||
areYouSureYouWantToDeleteThisBoard: 'Are you sure you want to delete this board?',
|
areYouSureYouWantToDeleteThisBoard: 'Are you sure you want to delete this board?',
|
||||||
areYouSureYouWantToDeleteThisCard: 'Are you sure you want to delete this card?',
|
areYouSureYouWantToDeleteThisCard: 'Are you sure you want to delete this card?',
|
||||||
@@ -43,15 +45,15 @@ export default {
|
|||||||
board: 'Board',
|
board: 'Board',
|
||||||
boardNotFound_title: 'Board Not Found',
|
boardNotFound_title: 'Board Not Found',
|
||||||
canComment: 'Can comment',
|
canComment: 'Can comment',
|
||||||
canEditContentOfBoard: 'Can edit the content of the board',
|
canEditContentOfBoard: 'Can edit the content of the board.',
|
||||||
canOnlyViewBoard: 'Can only view the board',
|
canOnlyViewBoard: 'Can only view the board.',
|
||||||
cardActions_title: 'Card Actions',
|
cardActions_title: 'Card Actions',
|
||||||
cardNotFound_title: 'Card Not Found',
|
cardNotFound_title: 'Card Not Found',
|
||||||
cardOrActionAreDeleted: 'Card or action are deleted',
|
cardOrActionAreDeleted: 'Card or action are deleted.',
|
||||||
color: 'Color',
|
color: 'Color',
|
||||||
createBoard_title: 'Create Board',
|
createBoard_title: 'Create Board',
|
||||||
createLabel_title: 'Create Label',
|
createLabel_title: 'Create Label',
|
||||||
createNewOneOrSelectExistingOne: 'Create a new one or select<br />an existing one',
|
createNewOneOrSelectExistingOne: 'Create a new one or select<br />an existing one.',
|
||||||
createProject_title: 'Create Project',
|
createProject_title: 'Create Project',
|
||||||
createTextFile_title: 'Create Text File',
|
createTextFile_title: 'Create Text File',
|
||||||
currentPassword: 'Current password',
|
currentPassword: 'Current password',
|
||||||
@@ -80,11 +82,11 @@ export default {
|
|||||||
editLabel_title: 'Edit Label',
|
editLabel_title: 'Edit Label',
|
||||||
editPassword_title: 'Edit Password',
|
editPassword_title: 'Edit Password',
|
||||||
editPermissions_title: 'Edit Permissions',
|
editPermissions_title: 'Edit Permissions',
|
||||||
editTimer_title: 'Edit Timer',
|
editStopwatch_title: 'Edit Stopwatch',
|
||||||
editUsername_title: 'Edit Username',
|
editUsername_title: 'Edit Username',
|
||||||
email: 'E-mail',
|
email: 'E-mail',
|
||||||
emailAlreadyInUse: 'E-mail already in use',
|
emailAlreadyInUse: 'E-mail already in use',
|
||||||
enterCardTitle: 'Enter card title... [Ctrl+Enter] to auto-open',
|
enterCardTitle: 'Enter card title... [Ctrl+Enter] to auto-open.',
|
||||||
enterDescription: 'Enter description...',
|
enterDescription: 'Enter description...',
|
||||||
enterFilename: 'Enter filename',
|
enterFilename: 'Enter filename',
|
||||||
enterListTitle: 'Enter list title...',
|
enterListTitle: 'Enter list title...',
|
||||||
@@ -117,14 +119,14 @@ export default {
|
|||||||
noLists: 'No lists',
|
noLists: 'No lists',
|
||||||
noProjects: 'No projects',
|
noProjects: 'No projects',
|
||||||
notifications: 'Notifications',
|
notifications: 'Notifications',
|
||||||
noUnreadNotifications: 'No unread notifications',
|
noUnreadNotifications: 'No unread notifications.',
|
||||||
openBoard_title: 'Open Board',
|
openBoard_title: 'Open Board',
|
||||||
optional_inline: 'optional',
|
optional_inline: 'optional',
|
||||||
organization: 'Organization',
|
organization: 'Organization',
|
||||||
phone: 'Phone',
|
phone: 'Phone',
|
||||||
preferences: 'Preferences',
|
preferences: 'Preferences',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: press Ctrl-V (Cmd-V on Mac) to add an attachment from the clipboard',
|
'Tip: press Ctrl-V (Cmd-V on Mac) to add an attachment from the clipboard.',
|
||||||
project: 'Project',
|
project: 'Project',
|
||||||
projectNotFound_title: 'Project Not Found',
|
projectNotFound_title: 'Project Not Found',
|
||||||
removeManager_title: 'Remove Manager',
|
removeManager_title: 'Remove Manager',
|
||||||
@@ -138,13 +140,13 @@ export default {
|
|||||||
selectPermissions_title: 'Select Permissions',
|
selectPermissions_title: 'Select Permissions',
|
||||||
selectProject: 'Select project',
|
selectProject: 'Select project',
|
||||||
settings: 'Settings',
|
settings: 'Settings',
|
||||||
|
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',
|
||||||
tasks: 'Tasks',
|
tasks: 'Tasks',
|
||||||
thereIsNoPreviewAvailableForThisAttachment:
|
thereIsNoPreviewAvailableForThisAttachment:
|
||||||
'There is no preview available for this attachment',
|
'There is no preview available for this attachment.',
|
||||||
time: 'Time',
|
time: 'Time',
|
||||||
timer: 'Timer',
|
|
||||||
title: 'Title',
|
title: 'Title',
|
||||||
userActions_title: 'User Actions',
|
userActions_title: 'User Actions',
|
||||||
userAddedThisCardToList: '<0>{{user}}</0><1> added this card to {{list}}</1>',
|
userAddedThisCardToList: '<0>{{user}}</0><1> added this card to {{list}}</1>',
|
||||||
@@ -201,7 +203,7 @@ export default {
|
|||||||
editInformation_title: 'Edit Information',
|
editInformation_title: 'Edit Information',
|
||||||
editPassword_title: 'Edit Password',
|
editPassword_title: 'Edit Password',
|
||||||
editPermissions: 'Edit permissions',
|
editPermissions: 'Edit permissions',
|
||||||
editTimer_title: 'Edit Timer',
|
editStopwatch_title: 'Edit Stopwatch',
|
||||||
editTitle_title: 'Edit Title',
|
editTitle_title: 'Edit Title',
|
||||||
editUsername_title: 'Edit Username',
|
editUsername_title: 'Edit Username',
|
||||||
hideDetails: 'Hide details',
|
hideDetails: 'Hide details',
|
||||||
|
|||||||
@@ -11,10 +11,12 @@ export default {
|
|||||||
projectManagement: 'Project management',
|
projectManagement: 'Project management',
|
||||||
serverConnectionFailed: 'Server connection failed',
|
serverConnectionFailed: 'Server connection failed',
|
||||||
unknownError: 'Unknown error, try again later',
|
unknownError: 'Unknown error, try again later',
|
||||||
|
useSingleSignOn: 'Use single sign-on',
|
||||||
},
|
},
|
||||||
|
|
||||||
action: {
|
action: {
|
||||||
logIn: 'Log in',
|
logIn: 'Log in',
|
||||||
|
logInWithSSO: 'Log in with SSO',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user