fix: Decouple BASE_URL from Ingress host (#498)

Closes #496

.github/workflows/helm-chart-release.yml

@@ -0,0 +1,42 @@
+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: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        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.5.0
+        with:
+          charts_dir: charts
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -10,3 +10,6 @@ docker-compose.override.yml
 # `npm i --package-lock-only`
 pnpm-lock.yaml
 yarn.lock
+
+# Chart dependencies
+**/charts/*.tgz

charts/planka/.helmignore

@@ -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/

charts/planka/Chart.lock

@@ -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"

charts/planka/Chart.yaml

@@ -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.2
+
+# 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.12.0"
+
+dependencies:
+- alias: postgresql
+  condition: postgresql.enabled
+  name: postgresql
+  repository: &bitnami-repo https://charts.bitnami.com/bitnami
+  version: 12.5.1

charts/planka/README.md

@@ -0,0 +1,84 @@
+# 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
+```
+
+> **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 ingress.enabled=true \
+--set ingress.hosts[0].host=planka.example.dev \
+
+# HTTPS
+helm install planka . --set secretkey=$SECRETKEY \
+--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>"
+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).

charts/planka/templates/NOTES.txt

@@ -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 }}

charts/planka/templates/_helpers.tpl

@@ -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 }}

charts/planka/templates/deployment.yaml

@@ -0,0 +1,97 @@
+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.port }}
+              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"
+      {{- 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 }}

charts/planka/templates/hpa.yaml

@@ -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 }}

charts/planka/templates/ingress.yaml

@@ -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 }}

charts/planka/templates/pvc.yaml

@@ -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 }}

charts/planka/templates/service.yaml

@@ -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 }}

charts/planka/templates/serviceaccount.yaml

@@ -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 }}

charts/planka/templates/tests/test-connection.yaml

@@ -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

charts/planka/values.yaml

@@ -0,0 +1,111 @@
+# 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
+
+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

client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.10.3
+REACT_APP_VERSION=1.12.0

client/src/api/activities.js

@@ -1,4 +1,5 @@
 import socket from './socket';
+import { transformUser } from './users';
 
 /* Transformers */
 
@@ -13,6 +14,10 @@ const getActivities = (cardId, data, headers) =>
   socket.get(`/cards/${cardId}/actions`, data, headers).then((body) => ({
     ...body,
     items: body.items.map(transformActivity),
+    included: {
+      ...body.included,
+      users: body.included.users.map(transformUser),
+    },
   }));
 
 /* Event handlers */

client/src/api/board-memberships.js

@@ -1,18 +1,50 @@
 import socket from './socket';
 
+/* Transformers */
+
+export const transformBoardMembership = (boardMembership) => ({
+  ...boardMembership,
+  createdAt: new Date(boardMembership.createdAt),
+});
+
 /* Actions */
 
 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) =>
-  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) =>
-  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 {
   createBoardMembership,
   updateBoardMembership,
   deleteBoardMembership,
+  makeHandleBoardMembershipCreate,
+  makeHandleBoardMembershipUpdate,
+  makeHandleBoardMembershipDelete,
 };

client/src/api/boards.js

@@ -1,12 +1,20 @@
 import socket from './socket';
 import http from './http';
+import { transformUser } from './users';
+import { transformBoardMembership } from './board-memberships';
 import { transformCard } from './cards';
 import { transformAttachment } from './attachments';
 
 /* Actions */
 
 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) =>
   http.post(`/projects/${projectId}/boards?requestId=${requestId}`, data, headers);
@@ -18,6 +26,8 @@ const getBoard = (id, subscribe, headers) =>
       ...body,
       included: {
         ...body.included,
+        users: body.included.users.map(transformUser),
+        boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
         cards: body.included.cards.map(transformCard),
         attachments: body.included.attachments.map(transformAttachment),
       },

client/src/api/notifications.js

@@ -1,6 +1,7 @@
 import omit from 'lodash/omit';
 
 import socket from './socket';
+import { transformUser } from './users';
 import { transformCard } from './cards';
 import { transformActivity } from './activities';
 
@@ -19,6 +20,7 @@ const getNotifications = (headers) =>
     items: body.items.map(transformNotification),
     included: {
       ...omit(body.included, 'actions'),
+      users: body.included.users.map(transformUser),
       cards: body.included.cards.map(transformCard),
       activities: body.included.actions.map(transformActivity),
     },
@@ -30,6 +32,7 @@ const getNotification = (id, headers) =>
     item: transformNotification(body.item),
     included: {
       ...omit(body.included, 'actions'),
+      users: body.included.users.map(transformUser),
       cards: body.included.cards.map(transformCard),
       activities: body.included.actions.map(transformActivity),
     },

client/src/api/project-managers.js

@@ -1,14 +1,40 @@
 import socket from './socket';
 
+/* Transformers */
+
+export const transformProjectManager = (projectManager) => ({
+  ...projectManager,
+  createdAt: new Date(projectManager.createdAt),
+});
+
 /* Actions */
 
 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) =>
-  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 {
   createProjectManager,
   deleteProjectManager,
+  makeHandleProjectManagerCreate,
+  makeHandleProjectManagerDelete,
 };

client/src/api/projects.js

@@ -1,13 +1,41 @@
 import http from './http';
 import socket from './socket';
+import { transformUser } from './users';
+import { transformProjectManager } from './project-managers';
+import { transformBoardMembership } from './board-memberships';
 
 /* 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);
 

client/src/api/users.js

@@ -1,30 +1,87 @@
 import http from './http';
 import socket from './socket';
 
+/* Transformers */
+
+export const transformUser = (user) => ({
+  ...user,
+  createdAt: new Date(user.createdAt),
+});
+
 /* 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) =>
-  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) =>
-  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) =>
-  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 {
   getUsers,
@@ -37,4 +94,7 @@ export default {
   updateUserUsername,
   updateUserAvatar,
   deleteUser,
+  makeHandleUserCreate,
+  makeHandleUserUpdate,
+  makeHandleUserDelete,
 };

client/src/components/CardModal/Activities/CommentEdit.jsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 import TextareaAutosize from 'react-textarea-autosize';
 import { Button, Form, TextArea } from 'semantic-ui-react';
 
-import { useClosableForm, useForm } from '../../../hooks';
+import { useForm } from '../../../hooks';
 
 import styles from './CommentEdit.module.scss';
 
@@ -35,12 +35,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
       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);
     }
 
@@ -65,10 +60,9 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
     [submit],
   );
 
-  const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
+  const handleFieldBlur = useCallback(() => {
-    close,
+    submit();
-    isOpened,
+  }, [submit]);
-  );
 
   const handleSubmit = useCallback(() => {
     submit();
@@ -99,13 +93,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
         onBlur={handleFieldBlur}
       />
       <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>
     </Form>
   );

client/src/components/CardModal/DescriptionEdit.jsx

@@ -100,7 +100,6 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
         onChange={setValue}
       />
       <div className={styles.controls}>
-        {/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
         <Button positive content={t('action.save')} />
       </div>
     </Form>

client/src/components/CardModal/Tasks/NameEdit.jsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import TextareaAutosize from 'react-textarea-autosize';
 import { Button, Form, TextArea } from 'semantic-ui-react';
 
-import { useClosableForm, useField } from '../../../hooks';
+import { useField } from '../../../hooks';
 
 import styles from './NameEdit.module.scss';
 
@@ -28,12 +28,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
   const submit = useCallback(() => {
     const cleanValue = value.trim();
 
-    if (!cleanValue) {
+    if (cleanValue && cleanValue !== defaultValue) {
-      field.current.ref.current.select();
-      return;
-    }
-
-    if (cleanValue !== defaultValue) {
       onUpdate(cleanValue);
     }
 
@@ -60,10 +55,9 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
     [submit],
   );
 
-  const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
+  const handleFieldBlur = useCallback(() => {
-    close,
+    submit();
-    isOpened,
+  }, [submit]);
-  );
 
   const handleSubmit = useCallback(() => {
     submit();
@@ -93,13 +87,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
         onBlur={handleFieldBlur}
       />
       <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>
     </Form>
   );

client/src/components/Header/Header.jsx

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 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 Paths from '../../constants/Paths';
@@ -55,15 +55,16 @@ const Header = React.memo(
               >
                 <Icon fitted name="arrow left" />
               </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}
+                {canEditProject && (
+                  <Button
+                    className={classNames(styles.editButton, styles.target)}
+                    onClick={handleProjectSettingsClick}
+                  >
+                    <Icon fitted name="pencil" size="small" />
+                  </Button>
+                )}
               </Menu.Item>
             </Menu.Menu>
           )}

client/src/components/Header/Header.module.scss

@@ -1,4 +1,20 @@
 :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 {
     cursor: auto;
     user-select: auto;
@@ -11,6 +27,10 @@
     &:hover {
       background: transparent;
       color: rgba(255, 255, 255, 0.9);
+
+      .target {
+        opacity: 1;
+      }
     }
   }
 

client/src/locales/cs/core.js

@@ -13,6 +13,7 @@ export default {
 
   translation: {
     common: {
+      aboutPlanka: 'O aplikaci Planka',
       account: 'Účet',
       actions: 'Akce',
       addAttachment_title: 'Přidat přílohu',
@@ -45,6 +46,9 @@ export default {
       background: 'Pozadí',
       board: 'Tabule',
       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ě',
       cardNotFound_title: 'Karta nenalezena',
       cardOrActionAreDeleted: 'Karta nebo akce je smazána',
@@ -68,14 +72,18 @@ export default {
       deleteTask_title: 'Smazat úkol',
       deleteUser_title: 'Smazat uživatele',
       description: 'Popis',
+      detectAutomatically: 'Automatická detekce',
       dropFileToUpload: 'Přetáhnutím nahraj soubor',
+      editor: 'Editor',
       editAttachment_title: 'Upravit přílohu',
       editAvatar_title: 'Upravit avatar',
       editBoard_title: 'Upravit tabuli',
       editDueDate_title: 'Upravit Termín do',
       editEmail_title: 'Upravit e-mail',
+      editInformation_title: 'Upravit informace',
       editLabel_title: 'Upravit štítek',
       editPassword_title: 'Upravit heslo',
+      editPermissions_title: 'Upravit oprávnění',
       editStopwatch_title: 'Upravit časovač',
       editUsername_title: 'Upravit uživatelské jméno',
       email: 'E-mail',
@@ -89,10 +97,13 @@ export default {
       filterByLabels_title: 'Filtruj podle štítku',
       filterByMembers_title: 'Filtruj podle člena',
       fromComputer_title: 'Z počítače',
+      fromTrello: 'Z Trella',
       general: 'Obecné',
       hours: 'Hodiny',
+      importBoard_title: 'Importovat tabuli',
       invalidCurrentPassword: 'Neplatné aktuální heslo',
       labels: 'Štítky',
+      language: 'Jazyk',
       leaveBoard_title: 'Opustit tabuli',
       leaveProject_title: 'Opustit projekt',
       list: 'Seznam',
@@ -122,15 +133,20 @@ export default {
       projectNotFound_title: 'Projekt nenalezen',
       removeManager_title: 'Odstranit vedoucího',
       removeMember_title: 'Odstranit člena',
+      searchLabels: 'Hledat štítky...',
+      searchMembers: 'Hledat členy...',
+      searchUsers: 'Hledat uživatele...',
       seconds: 'Vteřin',
       selectBoard: 'Vybrat tabuli',
       selectList: 'Vybrat seznam',
+      selectPermissions_title: 'Vybrat oprávnění',
       selectProject: 'Vybrat projekt',
       settings: 'Nastavení',
       stopwatch: 'Časovač',
       subscribeToMyOwnCardsByDefault: 'Ve výchozím nastavení odebírat vlastní karty',
       taskActions_title: 'Akce na úkolu',
       tasks: 'Úkoly',
+      thereIsNoPreviewAvailableForThisAttachment: 'Pro tuto přílohu není k dispozici žádný náhled',
       time: 'Čas',
       title: 'Titulek',
       userActions_title: 'Akce na uživateli',
@@ -142,6 +158,8 @@ export default {
       username: 'Uživatelské jméno',
       usernameAlreadyInUse: 'Uživatelské jméno se již používá',
       users: 'Uživatelé',
+      version: 'Verze',
+      viewer: 'Prohlížeč',
       writeComment: 'Napsat komentář...',
     },
 
@@ -153,6 +171,7 @@ export default {
       addCard_title: 'Přidat kartu',
       addComment: 'Přidat komentář',
       addList: 'Přidat seznam',
+      addMember: 'Přidat člena',
       addMoreDetailedDescription: 'Přidat další detailní popis',
       addTask: 'Přidat úkol',
       addToCard: 'Přidat na kartu',
@@ -182,10 +201,14 @@ export default {
       editDueDate_title: 'Upravit termín do',
       editDescription_title: 'Upravit popis',
       editEmail_title: 'Upravit e-mail',
+      editInformation_title: 'Upravit informace',
       editPassword_title: 'Upravit heslo',
+      editPermissions: 'Upravit oprávnění',
       editStopwatch_title: 'Upravit časovač',
       editTitle_title: 'Upravit titulek',
       editUsername_title: 'Upravit uživatelské jméno',
+      hideDetails: 'Skrýt detaily',
+      import: 'Import',
       leaveBoard: 'Opustit tabuli',
       leaveProject: 'Opustit projekt',
       logOut_title: 'Odhlásit se',
@@ -202,6 +225,7 @@ export default {
       save: 'Uložit',
       showAllAttachments: 'Zozbrazit všechny přílohy ({{hidden}} skryté)',
       showFewerAttachments: 'Zobrazit méně příloh',
+      showDetails: 'Zobrazit detaily',
       start: 'Start',
       stop: 'Stop',
       subscribe: 'Odebírat',

client/src/locales/ru/core.js

@@ -13,10 +13,12 @@ export default {
 
   translation: {
     common: {
+      aboutPlanka: 'О проекте Planka',
       account: 'Учетная запись',
       actions: 'Действия',
       addAttachment: 'Добавление вложения',
       addComment: 'Добавление комментария',
+      addManager_title: 'Добавление менеджера',
       addMember: 'Добавление участника',
       addUser: 'Добавление пользователя',
       administrator: 'Администратор',
@@ -32,11 +34,16 @@ export default {
       areYouSureYouWantToDeleteThisProject: 'Вы уверены, что хотите удалить этот проект?',
       areYouSureYouWantToDeleteThisTask: 'Вы уверены, что хотите удалить эту задачу?',
       areYouSureYouWantToDeleteThisUser: 'Вы уверены, что хотите удалить этого пользователя?',
-      areYouSureYouWantToRemoveThisMemberFromProject:
+      areYouSureYouWantToLeaveBoard: 'Вы уверены, что хотите покинуть эту доску?',
-        'Вы уверены, что хотите удалить этого участника из проекта?',
+      areYouSureYouWantToLeaveProject: 'Вы уверены, что хотите покинуть этот проект?',
+      areYouSureYouWantToRemoveThisManagerFromProject:
+        'Вы уверены, что хотите удалить этого менеджера из проекта?',
+      areYouSureYouWantToRemoveThisMemberFromBoard:
+        'Вы уверены, что хотите удалить этого участника из доски?',
       attachment: 'Вложение',
       attachments: 'Вложения',
       authentication: 'Аутентификация',
+      background: 'Фон',
       board: 'Доска',
       boardNotFound: 'Доска не найдена',
       canComment: 'Может комментировать',
@@ -53,6 +60,7 @@ export default {
       createProject: 'Создание проекта',
       createTextFile: 'Создание текстового файла',
       currentPassword: 'Текущий пароль',
+      dangerZone_title: 'Опасная зона',
       date: 'Дата',
       dueDate: 'Срок',
       deleteAttachment: 'Удаление вложения',
@@ -74,7 +82,8 @@ export default {
       editBackground: 'Изменение фона',
       editDueDate: 'Изменение срока',
       editEmail: 'Изменение e-mail',
-      editLabel: 'Изменения метки',
+      editInformation: 'Изменение информации',
+      editLabel: 'Изменение метки',
       editPassword: 'Изменение пароля',
       editPermissions: 'Редактирование разрешений',
       editStopwatch: 'Изменение секундомера',
@@ -91,12 +100,18 @@ export default {
       filterByLabels: 'Фильтр по меткам',
       filterByMembers: 'Фильтр по участникам',
       fromComputer: 'С компьютера',
+      fromTrello: 'Из Trello',
+      general: 'Основные',
       hours: 'Часы',
+      importBoard: 'Импорт доски',
       invalidCurrentPassword: 'Неверный текущий пароль',
       labels: 'Метки',
       language: 'Язык',
+      leaveBoard: 'Покинуть доску',
+      leaveProject: 'Покинуть проект',
       list: 'Список',
       listActions: 'Действия со списком',
+      managers: 'Менеджеры',
       members: 'Участники',
       minutes: 'Минуты',
       moveCard: 'Перемещение карточки',
@@ -120,6 +135,7 @@ export default {
       project: 'Проект',
       projectActions: 'Действия с проектом',
       projectNotFound: 'Проект не найден',
+      removeManager: 'Удалить менеджера',
       removeMember: 'Удаление участника',
       searchLabels: 'Поиск меток...',
       searchMembers: 'Поиск участников...',
@@ -131,7 +147,7 @@ export default {
       selectProject: 'Выберите проект',
       settings: 'Настройки',
       stopwatch: 'Секундомер',
-      subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки',
+      subscribeToMyOwnCardsByDefault: 'По умолчанию подписываться на мои собственные карточки',
       taskActions: 'Действия с задачей',
       tasks: 'Задачи',
       thereIsNoPreviewAvailableForThisAttachment: 'Предпросмотр для этого вложения недоступен',
@@ -147,6 +163,7 @@ export default {
       username: 'Имя пользователя',
       usernameAlreadyInUse: 'Имя пользователя уже занято',
       users: 'Пользователи',
+      version: 'Версия',
       viewer: 'Читатель',
       writeComment: 'Напишите комментарий...',
     },
@@ -185,6 +202,7 @@ export default {
       editDueDate: 'Изменить срок',
       editDescription: 'Изменить описание',
       editEmail: 'Изменить e-mail',
+      editInformation: 'Изменить информацию',
       editPassword: 'Изменить пароль',
       editPermissions: 'Изменить разрешения',
       editStopwatch: 'Изменить секундомер',
@@ -192,6 +210,9 @@ export default {
       editTitle: 'Изменить название',
       editUsername: 'Изменить имя пользователя',
       hideDetails: 'Скрыть подробности',
+      import: 'Импорт',
+      leaveBoard: 'Покинуть доску',
+      leaveProject: 'Покинуть проект',
       logOut: 'Выйти',
       makeCover: 'Сделать обложкой',
       move: 'Переместить',
@@ -199,7 +220,9 @@ export default {
       remove: 'Убрать',
       removeBackground: 'Убрать фон',
       removeCover: 'Убрать обложку',
+      removeFromBoard: 'Удалить из доски',
       removeFromProject: 'Удалить из проекта',
+      removeManager: 'Удалить менеджера',
       removeMember: 'Удалить участника',
       save: 'Сохранить',
       showAllAttachments: 'Показать все вложения ({{hidden}} скрыто)',

client/src/locales/zh/core.js

@@ -53,7 +53,7 @@ export default {
       dueDate_title: '截止日期',
       deleteAttachment_title: '删除附件',
       deleteBoard_title: '删除面板',
-      deleteCard_title: '删除擦片',
+      deleteCard_title: '删除卡片',
       deleteComment_title: '删除评论',
       deleteLabel_title: '删除标签',
       deleteList_title: '删除列表',
@@ -81,7 +81,7 @@ export default {
       enterTaskDescription: '输入任务描述...',
       filterByLabels_title: '通过标签筛选',
       filterByMembers_title: '通过成员筛选',
-      fromComputer_title: '从电脑',
+      fromComputer_title: '从本机',
       general: '全体',
       hours: '小时',
       invalidCurrentPassword: '当前密码错误',
@@ -110,7 +110,7 @@ export default {
       phone: '电话',
       preferences: '偏好',
       pressPasteShortcutToAddAttachmentFromClipboard:
-        '提示: 点击 Ctrl-V (Mac: Cmd-V) 从剪切板添加附件',
+        '提示: 按下 Ctrl-V (Mac: Cmd-V) 从剪切板添加附件',
       project: '项目',
       projectNotFound_title: '项目未找到',
       removeManager_title: '删除管理员',
@@ -134,7 +134,7 @@ export default {
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> 将该卡片从 {{fromList}} 移动到 {{toList}}</1>',
       username: '用户名',
-      usernameAlreadyInUse: '用户名已占用',
+      usernameAlreadyInUse: '用户名已被占用',
       users: '用户',
       writeComment: '编写评论...',
     },
@@ -149,7 +149,7 @@ export default {
       addList: '添加列表',
       addMoreDetailedDescription: '添加更多详细描述',
       addTask: '添加任务',
-      addToCard: '添加擦篇',
+      addToCard: '添加到卡片',
       addUser: '添加用户',
       createBoard: '创建面板',
       createFile: '创建文件',
@@ -177,7 +177,7 @@ export default {
       editDescription_title: '编辑描述',
       editEmail_title: '编辑邮箱',
       editPassword_title: '编辑密码',
-      editStopwatch_title: '编辑实践',
+      editStopwatch_title: '编辑时间',
       editTitle_title: '编辑标题',
       editUsername_title: '编辑用户名',
       leaveBoard: '离开面板',

client/src/models/Attachment.js

@@ -12,6 +12,9 @@ export default class extends BaseModel {
     coverUrl: attr(),
     image: attr(),
     name: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     cardId: fk({
       to: 'Card',
       as: 'card',

client/src/models/Board.js

@@ -172,7 +172,7 @@ export default class extends BaseModel {
   }
 
   getOrderedMembershipsQuerySet() {
-    return this.memberships.orderBy('id');
+    return this.memberships.orderBy('createdAt');
   }
 
   getOrderedLabelsQuerySet() {

client/src/models/BoardMembership.js

@@ -10,6 +10,9 @@ export default class extends BaseModel {
     id: attr(),
     role: attr(),
     canComment: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     boardId: fk({
       to: 'Board',
       as: 'board',

client/src/models/Card.js

@@ -244,7 +244,7 @@ export default class extends BaseModel {
   }
 
   getOrderedAttachmentsQuerySet() {
-    return this.attachments.orderBy('id', false);
+    return this.attachments.orderBy('createdAt', false);
   }
 
   getFilteredOrderedInCardActivitiesQuerySet() {
@@ -256,7 +256,7 @@ export default class extends BaseModel {
       filter.type = ActivityTypes.COMMENT_CARD;
     }
 
-    return this.activities.filter(filter).orderBy('id', false);
+    return this.activities.filter(filter).orderBy('createdAt', false);
   }
 
   getUnreadNotificationsQuerySet() {

client/src/models/Project.js

@@ -137,7 +137,7 @@ export default class extends BaseModel {
   }
 
   getOrderedManagersQuerySet() {
-    return this.managers.orderBy('id');
+    return this.managers.orderBy('createdAt');
   }
 
   getOrderedBoardsQuerySet() {

client/src/models/ProjectManager.js

@@ -8,6 +8,9 @@ export default class extends BaseModel {
 
   static fields = {
     id: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     projectId: fk({
       to: 'Project',
       as: 'project',

client/src/models/User.js

@@ -43,6 +43,9 @@ export default class extends BaseModel {
     organization: attr(),
     language: attr(),
     subscribeToOwnCards: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     deletedAt: attr(),
     isAdmin: attr({
       getDefault: () => false,
@@ -293,15 +296,15 @@ export default class extends BaseModel {
   static getOrderedUndeletedQuerySet() {
     return this.filter({
       deletedAt: null,
-    }).orderBy('id');
+    }).orderBy('createdAt');
   }
 
   getOrderedProjectManagersQuerySet() {
-    return this.projectManagers.orderBy('id');
+    return this.projectManagers.orderBy('createdAt');
   }
 
   getOrderedBoardMembershipsQuerySet() {
-    return this.boardMemberships.orderBy('id');
+    return this.boardMemberships.orderBy('createdAt');
   }
 
   getOrderedUnreadNotificationsQuerySet() {
@@ -309,7 +312,7 @@ export default class extends BaseModel {
       .filter({
         isRead: false,
       })
-      .orderBy('id', false);
+      .orderBy('createdAt', false);
   }
 
   getOrderedAvailableProjectsModelArray() {

client/src/sagas/core/watchers/socket.js

@@ -16,17 +16,17 @@ const createSocketEventsChannel = () =>
       emit(entryActions.handleSocketReconnect());
     };
 
-    const handleUserCreate = ({ item }) => {
+    const handleUserCreate = api.makeHandleUserCreate(({ item }) => {
       emit(entryActions.handleUserCreate(item));
-    };
+    });
 
-    const handleUserUpdate = ({ item }) => {
+    const handleUserUpdate = api.makeHandleUserUpdate(({ item }) => {
       emit(entryActions.handleUserUpdate(item));
-    };
+    });
 
-    const handleUserDelete = ({ item }) => {
+    const handleUserDelete = api.makeHandleUserDelete(({ item }) => {
       emit(entryActions.handleUserDelete(item));
-    };
+    });
 
     const handleProjectCreate = ({ item }) => {
       emit(entryActions.handleProjectCreate(item));
@@ -40,13 +40,13 @@ const createSocketEventsChannel = () =>
       emit(entryActions.handleProjectDelete(item));
     };
 
-    const handleProjectManagerCreate = ({ item }) => {
+    const handleProjectManagerCreate = api.makeHandleProjectManagerCreate(({ item }) => {
       emit(entryActions.handleProjectManagerCreate(item));
-    };
+    });
 
-    const handleProjectManagerDelete = ({ item }) => {
+    const handleProjectManagerDelete = api.makeHandleProjectManagerDelete(({ item }) => {
       emit(entryActions.handleProjectManagerDelete(item));
-    };
+    });
 
     const handleBoardCreate = ({ item, requestId }) => {
       emit(entryActions.handleBoardCreate(item, requestId));
@@ -60,17 +60,17 @@ const createSocketEventsChannel = () =>
       emit(entryActions.handleBoardDelete(item));
     };
 
-    const handleBoardMembershipCreate = ({ item }) => {
+    const handleBoardMembershipCreate = api.makeHandleBoardMembershipCreate(({ item }) => {
       emit(entryActions.handleBoardMembershipCreate(item));
-    };
+    });
 
-    const handleBoardMembershipUpdate = ({ item }) => {
+    const handleBoardMembershipUpdate = api.makeHandleBoardMembershipUpdate(({ item }) => {
       emit(entryActions.handleBoardMembershipUpdate(item));
-    };
+    });
 
-    const handleBoardMembershipDelete = ({ item }) => {
+    const handleBoardMembershipDelete = api.makeHandleBoardMembershipDelete(({ item }) => {
       emit(entryActions.handleBoardMembershipDelete(item));
-    };
+    });
 
     const handleListCreate = ({ item }) => {
       emit(entryActions.handleListCreate(item));

docker-compose.yml

@@ -23,6 +23,14 @@ services:
       - TRUST_PROXY=0
       - DATABASE_URL=postgresql://postgres@postgres/planka
       - SECRET_KEY=notsecretkey
+
+      # related: https://github.com/knex/knex/issues/2354
+      # As knex does not pass query parameters from the connection string we
+      # have to use environment variables in order to pass the desired values, e.g.
+      # - PGSSLMODE=<value>
+
+      # Configure knex to accept SSL certificates
+      # - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
     depends_on:
       - postgres
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "planka",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "planka",
-      "version": "1.11.0",
+      "version": "1.12.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "planka",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "private": true,
   "homepage": "https://plankanban.github.io/planka",
   "repository": {

server/.env.sample

@@ -9,6 +9,14 @@ SECRET_KEY=notsecretkey
 # TRUST_PROXY=0
 # TOKEN_EXPIRES_IN=365 # In days
 
+# related: https://github.com/knex/knex/issues/2354
+# As knex does not pass query parameters from the connection string we
+# have to use environment variables in order to pass the desired values, e.g.
+# PGSSLMODE=<value>
+
+# Configure knex to accept SSL certificates
+# KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
+
 ## Do not edit this
 
 TZ=UTC

server/api/controllers/access-tokens/delete.js

@@ -6,7 +6,7 @@ module.exports = {
       accessToken,
       deletedAt: null,
     }).set({
-      deletedAt: new Date().toUTCString(),
+      deletedAt: new Date().toISOString(),
     });
 
     return {

server/api/helpers/users/delete-one.js

@@ -30,7 +30,7 @@ module.exports = {
       id: inputs.record.id,
       deletedAt: null,
     }).set({
-      deletedAt: new Date().toUTCString(),
+      deletedAt: new Date().toISOString(),
     });
 
     if (user) {

server/api/helpers/users/update-one.js

@@ -64,7 +64,7 @@ module.exports = {
     if (!_.isUndefined(values.password)) {
       Object.assign(values, {
         password: bcrypt.hashSync(values.password, 10),
-        passwordChangedAt: new Date().toUTCString(),
+        passwordChangedAt: new Date().toISOString(),
       });
 
       if (Object.keys(values).length === 1) {

server/config/models.js

@@ -80,13 +80,13 @@ module.exports.models = {
   },
 
   beforeCreate(valuesToSet, proceed) {
-    valuesToSet.createdAt = new Date().toUTCString(); // eslint-disable-line no-param-reassign
+    valuesToSet.createdAt = new Date().toISOString(); // eslint-disable-line no-param-reassign
 
     proceed();
   },
 
   beforeUpdate(valuesToSet, proceed) {
-    valuesToSet.updatedAt = new Date().toUTCString(); // eslint-disable-line no-param-reassign
+    valuesToSet.updatedAt = new Date().toISOString(); // eslint-disable-line no-param-reassign
 
     proceed();
   },

server/db/knexfile.js

@@ -6,9 +6,22 @@ dotenv.config({
   path: path.resolve(__dirname, '../.env'),
 });
 
+function buildSSLConfig() {
+  if (process.env.KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE === 'false') {
+    return {
+      rejectUnauthorized: false,
+    };
+  }
+
+  return false;
+}
+
 module.exports = {
   client: 'pg',
-  connection: process.env.DATABASE_URL,
+  connection: {
+    connectionString: process.env.DATABASE_URL,
+    ssl: buildSSLConfig(),
+  },
   migrations: {
     tableName: 'migration',
     directory: path.join(__dirname, 'migrations'),

server/db/seeds/default.js

@@ -1,16 +1,12 @@
 const bcrypt = require('bcrypt');
 
-exports.seed = (knex) => {
+exports.seed = (knex) =>
-  const date = new Date().toUTCString();
+  knex('user_account').insert({
-
-  return knex('user_account').insert({
     email: 'demo@demo.demo',
     password: bcrypt.hashSync('demo', 10),
     isAdmin: true,
     name: 'Demo Demo',
     username: 'demo',
     subscribeToOwnCards: false,
-    createdAt: date,
+    createdAt: new Date().toISOString(),
-    updatedAt: date,
   });
-};