Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a26c468a9d | ||
|
|
0f076f4cc4 | ||
|
|
f1865db477 | ||
|
|
b80127e952 | ||
|
|
5e400c5c4e | ||
|
|
8367fa4a29 |
@@ -2,11 +2,6 @@ name: Build and push Docker DEV image
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
|
||||||
- '.github/**'
|
|
||||||
- 'charts/**'
|
|
||||||
- 'docker-*.sh'
|
|
||||||
- '*.md'
|
|
||||||
branches: [master]
|
branches: [master]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
@@ -38,6 +38,5 @@ jobs:
|
|||||||
uses: helm/chart-releaser-action@v1.5.0
|
uses: helm/chart-releaser-action@v1.5.0
|
||||||
with:
|
with:
|
||||||
charts_dir: charts
|
charts_dir: charts
|
||||||
mark_as_latest: false
|
|
||||||
env:
|
env:
|
||||||
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|||||||
+16
-11
@@ -1,22 +1,27 @@
|
|||||||
FROM node:lts-alpine
|
FROM node:lts-alpine
|
||||||
|
|
||||||
ARG VIPS_VERSION=8.14.5
|
ARG ALPINE_VERSION=3.16
|
||||||
|
ARG VIPS_VERSION=8.13.3
|
||||||
|
|
||||||
RUN apk -U upgrade \
|
RUN apk -U upgrade \
|
||||||
&& apk add \
|
&& apk add \
|
||||||
bash pkgconf \
|
bash giflib glib lcms2 libexif \
|
||||||
libjpeg-turbo libexif librsvg cgif tiff libspng libimagequant \
|
libgsf libjpeg-turbo libpng librsvg libwebp \
|
||||||
|
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 gobject-introspection-dev meson \
|
build-base giflib-dev glib-dev lcms2-dev libexif-dev \
|
||||||
libjpeg-turbo-dev libexif-dev librsvg-dev cgif-dev tiff-dev libspng-dev libimagequant-dev \
|
libgsf-dev libjpeg-turbo-dev libpng-dev librsvg-dev libwebp-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.xz | tar xJC /tmp \
|
&& wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.gz | tar xzC /tmp \
|
||||||
&& cd /tmp/vips-${VIPS_VERSION} \
|
&& cd /tmp/vips-${VIPS_VERSION} \
|
||||||
&& meson setup build-dir \
|
&& ./configure \
|
||||||
&& cd build-dir \
|
&& make \
|
||||||
&& ninja \
|
&& make install-strip \
|
||||||
&& ninja test \
|
|
||||||
&& ninja install \
|
|
||||||
&& rm -rf /tmp/vips-${VIPS_VERSION}
|
&& rm -rf /tmp/vips-${VIPS_VERSION}
|
||||||
|
|||||||
@@ -20,9 +20,10 @@
|
|||||||
|
|
||||||
## How to deploy Planka
|
## How to deploy Planka
|
||||||
|
|
||||||
There are many ways to install Planka
|
There are 2 types of installation:
|
||||||
|
- [Without Docker](https://docs.planka.cloud/docs/installl-planka/Debian%20&%20Ubuntu) ([for Windows](https://docs.planka.cloud/docs/installl-planka/Windows))
|
||||||
[Check them out](https://docs.planka.cloud/docs/intro)
|
- [Dockerized](https://docs.planka.cloud/docs/installl-planka/Docker%20Compose)
|
||||||
|
- [Automated installation](https://github.com/plankanban/planka-installer)
|
||||||
|
|
||||||
For configuration, please see the [configuration section](https://docs.planka.cloud/docs/category/configuration).
|
For configuration, please see the [configuration section](https://docs.planka.cloud/docs/category/configuration).
|
||||||
|
|
||||||
|
|||||||
@@ -15,17 +15,17 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.1.10
|
version: 0.1.2
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: "1.15.0"
|
appVersion: "1.12.0"
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- alias: postgresql
|
- alias: postgresql
|
||||||
condition: postgresql.enabled
|
condition: postgresql.enabled
|
||||||
name: postgresql
|
name: postgresql
|
||||||
repository: &bitnami-repo https://charts.bitnami.com/bitnami
|
repository: &bitnami-repo https://charts.bitnami.com/bitnami
|
||||||
version: 12.5.1
|
version: 12.5.1
|
||||||
|
|||||||
+1
-23
@@ -21,11 +21,7 @@ git clone https://github.com/Chris-Greaves/planka-helm-chart.git
|
|||||||
cd planka-helm-chart
|
cd planka-helm-chart
|
||||||
helm dependency build
|
helm dependency build
|
||||||
export SECRETKEY=$(openssl rand -hex 64)
|
export SECRETKEY=$(openssl rand -hex 64)
|
||||||
helm install planka . --set secretkey=$SECRETKEY \
|
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.
|
> **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.
|
||||||
@@ -43,19 +39,11 @@ To access Planka externally you can use the following configuration
|
|||||||
```bash
|
```bash
|
||||||
# HTTP only
|
# HTTP only
|
||||||
helm install planka . --set secretkey=$SECRETKEY \
|
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.enabled=true \
|
||||||
--set ingress.hosts[0].host=planka.example.dev \
|
--set ingress.hosts[0].host=planka.example.dev \
|
||||||
|
|
||||||
# HTTPS
|
# HTTPS
|
||||||
helm install planka . --set secretkey=$SECRETKEY \
|
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.enabled=true \
|
||||||
--set ingress.hosts[0].host=planka.example.dev \
|
--set ingress.hosts[0].host=planka.example.dev \
|
||||||
--set ingress.tls[0].secretName=planka-tls \
|
--set ingress.tls[0].secretName=planka-tls \
|
||||||
@@ -66,16 +54,6 @@ or create a values.yaml file like:
|
|||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
secretkey: "<InsertSecretKey>"
|
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:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
hosts:
|
hosts:
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ spec:
|
|||||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ .Values.service.containerPort | default 1337 }}
|
containerPort: {{ .Values.service.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
@@ -75,18 +75,6 @@ spec:
|
|||||||
value: {{ required "A secret key needs to be generated using 'openssl rand -hex 64' and assigned to secretkey." .Values.secretkey }}
|
value: {{ required "A secret key needs to be generated using 'openssl rand -hex 64' and assigned to secretkey." .Values.secretkey }}
|
||||||
- name: TRUST_PROXY
|
- name: TRUST_PROXY
|
||||||
value: "0"
|
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 }}
|
|
||||||
{{- with .Values.nodeSelector }}
|
{{- with .Values.nodeSelector }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
|
|||||||
@@ -46,10 +46,6 @@ securityContext: {}
|
|||||||
service:
|
service:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
port: 1337
|
port: 1337
|
||||||
## @param service.containerPort Planka HTTP container port
|
|
||||||
## If empty will default to 1337
|
|
||||||
##
|
|
||||||
containerPort: 1337
|
|
||||||
|
|
||||||
ingress:
|
ingress:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
REACT_APP_VERSION=1.15.0
|
REACT_APP_VERSION=1.12.0
|
||||||
|
|||||||
Generated
+22158
-3927
File diff suppressed because it is too large
Load Diff
+31
-31
@@ -55,60 +55,60 @@
|
|||||||
"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.30.0",
|
"date-fns": "^2.29.3",
|
||||||
"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": "^23.7.6",
|
"i18next": "^22.0.6",
|
||||||
"i18next-browser-languagedetector": "^7.2.0",
|
"i18next-browser-languagedetector": "^7.0.1",
|
||||||
"initials": "^3.1.2",
|
"initials": "^3.1.2",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.1",
|
||||||
"jwt-decode": "^4.0.0",
|
"jwt-decode": "^3.1.2",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"nanoid": "^5.0.3",
|
"node-sass": "^8.0.0",
|
||||||
"node-sass": "^9.0.0",
|
"photoswipe": "^5.3.3",
|
||||||
"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.21.0",
|
"react-datepicker": "^4.8.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-dropzone": "^14.2.3",
|
"react-dropzone": "^14.2.3",
|
||||||
"react-i18next": "^13.5.0",
|
"react-i18next": "^12.0.0",
|
||||||
"react-input-mask": "^2.0.4",
|
"react-input-mask": "^2.0.4",
|
||||||
"react-markdown": "^8.0.7",
|
"react-markdown": "^8.0.3",
|
||||||
"react-photoswipe-gallery": "^2.2.7",
|
"react-oidc-context": "^2.2.2",
|
||||||
"react-redux": "^8.1.3",
|
"react-photoswipe-gallery": "^2.2.2",
|
||||||
"react-router-dom": "^6.19.0",
|
"react-redux": "^8.0.5",
|
||||||
|
"react-router-dom": "^6.4.3",
|
||||||
"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.5.3",
|
"react-textarea-autosize": "^8.4.0",
|
||||||
"redux": "^4.2.1",
|
"redux": "^4.2.0",
|
||||||
"redux-logger": "^3.0.6",
|
"redux-logger": "^3.0.6",
|
||||||
"redux-orm": "^0.16.2",
|
"redux-orm": "^0.16.2",
|
||||||
"redux-saga": "^1.2.3",
|
"redux-saga": "^1.2.1",
|
||||||
"remark-breaks": "^4.0.0",
|
"remark-breaks": "^3.0.2",
|
||||||
"remark-gfm": "^4.0.0",
|
"remark-gfm": "^3.0.1",
|
||||||
"reselect": "^4.1.8",
|
"reselect": "^4.1.7",
|
||||||
"sails.io.js": "^1.2.1",
|
"sails.io.js": "^1.2.1",
|
||||||
"semantic-ui-react": "^2.1.4",
|
"semantic-ui-react": "^2.1.3",
|
||||||
"socket.io-client": "^2.5.0",
|
"socket.io-client": "^2.5.0",
|
||||||
"validator": "^13.11.0",
|
"validator": "^13.7.0",
|
||||||
"whatwg-fetch": "^3.6.19",
|
"whatwg-fetch": "^3.6.2",
|
||||||
"zxcvbn": "^4.4.2"
|
"zxcvbn": "^4.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@testing-library/jest-dom": "^6.1.4",
|
"@testing-library/jest-dom": "^5.16.5",
|
||||||
"@testing-library/react": "^14.1.0",
|
"@testing-library/react": "^13.4.0",
|
||||||
"@testing-library/user-event": "^14.5.1",
|
"@testing-library/user-event": "^13.5.0",
|
||||||
"babel-preset-airbnb": "^5.0.0",
|
"babel-preset-airbnb": "^5.0.0",
|
||||||
"chai": "^4.3.10",
|
"chai": "^4.3.7",
|
||||||
"eslint": "^8.53.0",
|
"eslint": "^8.28.0",
|
||||||
"eslint-config-airbnb": "^19.0.4",
|
"eslint-config-airbnb": "^19.0.4",
|
||||||
"eslint-plugin-import": "^2.29.0",
|
"eslint-plugin-import": "^2.26.0",
|
||||||
"eslint-plugin-jsx-a11y": "^6.8.0",
|
"eslint-plugin-jsx-a11y": "^6.6.1",
|
||||||
"eslint-plugin-react": "^7.33.2",
|
"eslint-plugin-react": "^7.31.11",
|
||||||
"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,14 +39,6 @@ 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,12 +1,5 @@
|
|||||||
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: {
|
||||||
@@ -28,33 +21,12 @@ 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,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,15 +4,14 @@ import socket from './socket';
|
|||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
|
const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
|
||||||
|
const exchangeOidcToken = (accessToken, headers) =>
|
||||||
const exchangeForAccessTokenUsingOidc = (data, headers) =>
|
http.post('/access-tokens/exchange', { token: accessToken }, 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,
|
||||||
|
exchangeOidcToken,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,15 +5,13 @@ import Config from '../constants/Config';
|
|||||||
const http = {};
|
const http = {};
|
||||||
|
|
||||||
// TODO: add all methods
|
// TODO: add all methods
|
||||||
['GET', 'POST'].forEach((method) => {
|
['POST'].forEach((method) => {
|
||||||
http[method.toLowerCase()] = (url, data, headers) => {
|
http[method.toLowerCase()] = (url, data, headers) => {
|
||||||
const formData =
|
const formData = Object.keys(data).reduce((result, key) => {
|
||||||
data &&
|
result.append(key, data[key]);
|
||||||
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,6 +1,5 @@
|
|||||||
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';
|
||||||
@@ -21,7 +20,6 @@ import notifications from './notifications';
|
|||||||
export { http, socket };
|
export { http, socket };
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
...root,
|
|
||||||
...accessTokens,
|
...accessTokens,
|
||||||
...users,
|
...users,
|
||||||
...projects,
|
...projects,
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
import http from './http';
|
|
||||||
|
|
||||||
/* Actions */
|
|
||||||
|
|
||||||
const getConfig = (headers) => http.get('/config', undefined, headers);
|
|
||||||
|
|
||||||
export default {
|
|
||||||
getConfig,
|
|
||||||
};
|
|
||||||
@@ -217,7 +217,6 @@ 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)}
|
||||||
@@ -267,7 +266,6 @@ 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)}
|
||||||
@@ -316,11 +314,10 @@ const CardModal = React.memo(
|
|||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
{canEdit && (
|
{canEdit && (
|
||||||
// eslint-disable-next-line jsx-a11y/control-has-associated-label
|
|
||||||
<button
|
<button
|
||||||
|
onClick={handleToggleStopwatchClick}
|
||||||
type="button"
|
type="button"
|
||||||
className={classNames(styles.attachment, styles.dueDate)}
|
className={classNames(styles.attachment, styles.dueDate)}
|
||||||
onClick={handleToggleStopwatchClick}
|
|
||||||
>
|
>
|
||||||
<Icon
|
<Icon
|
||||||
name={stopwatch.startedAt ? 'pause' : 'play'}
|
name={stopwatch.startedAt ? 'pause' : 'play'}
|
||||||
|
|||||||
@@ -48,21 +48,14 @@ const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onMove, onDelete
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{items.length > 0 && (
|
{items.length > 0 && (
|
||||||
<>
|
<Progress
|
||||||
<span className={styles.progressWrapper}>
|
autoSuccess
|
||||||
<Progress
|
value={completedItems.length}
|
||||||
autoSuccess
|
total={items.length}
|
||||||
value={completedItems.length}
|
color="blue"
|
||||||
total={items.length}
|
size="tiny"
|
||||||
color="blue"
|
className={styles.progress}
|
||||||
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,23 +3,6 @@
|
|||||||
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;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ 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 { Button, Icon, Menu } from 'semantic-ui-react';
|
import { Button, Icon, Menu } from 'semantic-ui-react';
|
||||||
|
import { useAuth } from 'react-oidc-context';
|
||||||
import { usePopup } from '../../lib/popup';
|
import { usePopup } from '../../lib/popup';
|
||||||
|
|
||||||
import Paths from '../../constants/Paths';
|
import Paths from '../../constants/Paths';
|
||||||
@@ -29,6 +30,7 @@ const Header = React.memo(
|
|||||||
onUserSettingsClick,
|
onUserSettingsClick,
|
||||||
onLogout,
|
onLogout,
|
||||||
}) => {
|
}) => {
|
||||||
|
const auth = useAuth();
|
||||||
const handleProjectSettingsClick = useCallback(() => {
|
const handleProjectSettingsClick = useCallback(() => {
|
||||||
if (canEditProject) {
|
if (canEditProject) {
|
||||||
onProjectSettingsClick();
|
onProjectSettingsClick();
|
||||||
@@ -38,6 +40,11 @@ const Header = React.memo(
|
|||||||
const NotificationsPopup = usePopup(NotificationsStep, POPUP_PROPS);
|
const NotificationsPopup = usePopup(NotificationsStep, POPUP_PROPS);
|
||||||
const UserPopup = usePopup(UserStep, POPUP_PROPS);
|
const UserPopup = usePopup(UserStep, POPUP_PROPS);
|
||||||
|
|
||||||
|
const onFullLogout = () => {
|
||||||
|
auth.signoutSilent();
|
||||||
|
onLogout();
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles.wrapper}>
|
<div className={styles.wrapper}>
|
||||||
{!project && (
|
{!project && (
|
||||||
@@ -88,7 +95,7 @@ const Header = React.memo(
|
|||||||
<UserPopup
|
<UserPopup
|
||||||
isLogouting={isLogouting}
|
isLogouting={isLogouting}
|
||||||
onSettingsClick={onUserSettingsClick}
|
onSettingsClick={onUserSettingsClick}
|
||||||
onLogout={onLogout}
|
onLogout={onFullLogout}
|
||||||
>
|
>
|
||||||
<Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
|
<Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
|
||||||
{user.name}
|
{user.name}
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import isEmail from 'validator/lib/isEmail';
|
import isEmail from 'validator/lib/isEmail';
|
||||||
import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
||||||
|
import { useAuth } from 'react-oidc-context';
|
||||||
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 { Button, Form, Grid, Header, Message } from 'semantic-ui-react';
|
import { 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,21 +29,6 @@ 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',
|
||||||
@@ -62,16 +48,8 @@ const createMessage = (error) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const Login = React.memo(
|
const Login = React.memo(
|
||||||
({
|
({ defaultData, isSubmitting, error, onAuthenticate, onMessageDismiss }) => {
|
||||||
defaultData,
|
const auth = useAuth();
|
||||||
isSubmitting,
|
|
||||||
isSubmittingUsingOidc,
|
|
||||||
error,
|
|
||||||
withOidc,
|
|
||||||
onAuthenticate,
|
|
||||||
onAuthenticateUsingOidc,
|
|
||||||
onMessageDismiss,
|
|
||||||
}) => {
|
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const wasSubmitting = usePrevious(isSubmitting);
|
const wasSubmitting = usePrevious(isSubmitting);
|
||||||
|
|
||||||
@@ -192,19 +170,12 @@ const Login = React.memo(
|
|||||||
content={t('action.logIn')}
|
content={t('action.logIn')}
|
||||||
floated="right"
|
floated="right"
|
||||||
loading={isSubmitting}
|
loading={isSubmitting}
|
||||||
disabled={isSubmitting || isSubmittingUsingOidc}
|
disabled={isSubmitting}
|
||||||
/>
|
/>
|
||||||
</Form>
|
</Form>
|
||||||
{withOidc && (
|
<Form.Button type="button" onClick={() => auth.signinRedirect()}>
|
||||||
<Button
|
Log in with SSO
|
||||||
type="button"
|
</Form.Button>
|
||||||
loading={isSubmittingUsingOidc}
|
|
||||||
disabled={isSubmitting || isSubmittingUsingOidc}
|
|
||||||
onClick={onAuthenticateUsingOidc}
|
|
||||||
>
|
|
||||||
{t('action.logInWithSSO')}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Grid.Column>
|
</Grid.Column>
|
||||||
@@ -235,15 +206,10 @@ const Login = React.memo(
|
|||||||
);
|
);
|
||||||
|
|
||||||
Login.propTypes = {
|
Login.propTypes = {
|
||||||
/* eslint-disable react/forbid-prop-types */
|
defaultData: PropTypes.object.isRequired, // eslint-disable-line 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,
|
|
||||||
onAuthenticate: PropTypes.func.isRequired,
|
onAuthenticate: PropTypes.func.isRequired,
|
||||||
onAuthenticateUsingOidc: PropTypes.func.isRequired,
|
|
||||||
onMessageDismiss: PropTypes.func.isRequired,
|
onMessageDismiss: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
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;
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { useAuth } from 'react-oidc-context';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
let isLoggingIn = true;
|
||||||
|
const OidcLogin = React.memo(({ onAuthenticate }) => {
|
||||||
|
const auth = useAuth();
|
||||||
|
if (isLoggingIn && auth.user) {
|
||||||
|
isLoggingIn = false;
|
||||||
|
const { user } = auth;
|
||||||
|
onAuthenticate(user);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
OidcLogin.propTypes = {
|
||||||
|
onAuthenticate: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default OidcLogin;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import OidcLogin from './OidcLogin';
|
||||||
|
|
||||||
|
export default OidcLogin;
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
import { AuthProvider } from 'react-oidc-context';
|
||||||
import { Provider } from 'react-redux';
|
import { Provider } from 'react-redux';
|
||||||
import { Route, Routes } from 'react-router-dom';
|
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 LoginWrapperContainer from '../containers/LoginWrapperContainer';
|
import LoginContainer from '../containers/LoginContainer';
|
||||||
import CoreContainer from '../containers/CoreContainer';
|
import CoreContainer from '../containers/CoreContainer';
|
||||||
import NotFound from './NotFound';
|
import NotFound from './NotFound';
|
||||||
|
|
||||||
@@ -14,29 +15,40 @@ 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';
|
||||||
|
import OidcLoginContainer from '../containers/OidcLoginContainer';
|
||||||
|
|
||||||
function Root({ store, history }) {
|
function Root({ store, history, config }) {
|
||||||
return (
|
return (
|
||||||
<Provider store={store}>
|
<AuthProvider
|
||||||
<ReduxRouter history={history}>
|
authority={config.authority}
|
||||||
<Routes>
|
client_id={config.clientId}
|
||||||
<Route path={Paths.LOGIN} element={<LoginWrapperContainer />} />
|
redirect_uri={config.redirectUri}
|
||||||
<Route path={Paths.OIDC_CALLBACK} element={<LoginWrapperContainer />} />
|
scope={config.scopes}
|
||||||
<Route path={Paths.ROOT} element={<CoreContainer />} />
|
onSigninCallback={() => {
|
||||||
<Route path={Paths.PROJECTS} element={<CoreContainer />} />
|
window.history.replaceState({}, document.title, window.location.pathname);
|
||||||
<Route path={Paths.BOARDS} element={<CoreContainer />} />
|
}}
|
||||||
<Route path={Paths.CARDS} element={<CoreContainer />} />
|
>
|
||||||
<Route path="*" element={<NotFound />} />
|
<Provider store={store}>
|
||||||
</Routes>
|
<ReduxRouter history={history}>
|
||||||
</ReduxRouter>
|
<Routes>
|
||||||
</Provider>
|
<Route path={Paths.LOGIN} element={<LoginContainer />} />
|
||||||
|
<Route path={Paths.OIDC_LOGIN} element={<OidcLoginContainer />} />
|
||||||
|
<Route path={Paths.ROOT} element={<CoreContainer />} />
|
||||||
|
<Route path={Paths.PROJECTS} element={<CoreContainer />} />
|
||||||
|
<Route path={Paths.BOARDS} element={<CoreContainer />} />
|
||||||
|
<Route path={Paths.CARDS} element={<CoreContainer />} />
|
||||||
|
<Route path="*" element={<NotFound />} />
|
||||||
|
</Routes>
|
||||||
|
</ReduxRouter>
|
||||||
|
</Provider>
|
||||||
|
</AuthProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Root.propTypes = {
|
Root.propTypes = {
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
store: PropTypes.object.isRequired,
|
store: PropTypes.object.isRequired,
|
||||||
history: PropTypes.object.isRequired,
|
history: PropTypes.object.isRequired,
|
||||||
|
config: PropTypes.object.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ const UserSettingsModal = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
|
||||||
isLocked,
|
isLocked,
|
||||||
|
subscribeToOwnCards,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
@@ -106,8 +106,8 @@ UserSettingsModal.propTypes = {
|
|||||||
phone: PropTypes.string,
|
phone: PropTypes.string,
|
||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
language: PropTypes.string,
|
language: PropTypes.string,
|
||||||
subscribeToOwnCards: PropTypes.bool.isRequired,
|
|
||||||
isLocked: PropTypes.bool.isRequired,
|
isLocked: PropTypes.bool.isRequired,
|
||||||
|
subscribeToOwnCards: 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,
|
||||||
|
|||||||
@@ -153,15 +153,13 @@ const ActionsStep = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
||||||
|
{t('action.deleteUser', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Menu.Item>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{!user.isDeletionLocked && (
|
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
|
||||||
{t('action.deleteUser', {
|
|
||||||
context: 'title',
|
|
||||||
})}
|
|
||||||
</Menu.Item>
|
|
||||||
)}
|
|
||||||
</Menu>
|
</Menu>
|
||||||
</Popup.Content>
|
</Popup.Content>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ const Item = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
isLocked,
|
isLocked,
|
||||||
isRoleLocked,
|
|
||||||
isDeletionLocked,
|
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
@@ -49,7 +47,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} disabled={isRoleLocked} onChange={handleIsAdminChange} />
|
<Radio toggle checked={isAdmin} disabled={isLocked} onChange={handleIsAdminChange} />
|
||||||
</Table.Cell>
|
</Table.Cell>
|
||||||
<Table.Cell textAlign="right">
|
<Table.Cell textAlign="right">
|
||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
@@ -61,7 +59,6 @@ const Item = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
isLocked,
|
isLocked,
|
||||||
isDeletionLocked,
|
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
@@ -94,8 +91,6 @@ Item.propTypes = {
|
|||||||
phone: PropTypes.string,
|
phone: PropTypes.string,
|
||||||
isAdmin: PropTypes.bool.isRequired,
|
isAdmin: PropTypes.bool.isRequired,
|
||||||
isLocked: PropTypes.bool.isRequired,
|
isLocked: PropTypes.bool.isRequired,
|
||||||
isRoleLocked: 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,
|
||||||
|
|||||||
@@ -111,8 +111,6 @@ const UsersModal = React.memo(
|
|||||||
phone={item.phone}
|
phone={item.phone}
|
||||||
isAdmin={item.isAdmin}
|
isAdmin={item.isAdmin}
|
||||||
isLocked={item.isLocked}
|
isLocked={item.isLocked}
|
||||||
isRoleLocked={item.isRoleLocked}
|
|
||||||
isDeletionLocked={item.isDeletionLocked}
|
|
||||||
emailUpdateForm={item.emailUpdateForm}
|
emailUpdateForm={item.emailUpdateForm}
|
||||||
passwordUpdateForm={item.passwordUpdateForm}
|
passwordUpdateForm={item.passwordUpdateForm}
|
||||||
usernameUpdateForm={item.usernameUpdateForm}
|
usernameUpdateForm={item.usernameUpdateForm}
|
||||||
|
|||||||
@@ -12,19 +12,14 @@ 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,7 +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 OIDC_LOGIN = `${Config.BASE_PATH}/oidclogin`;
|
||||||
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`;
|
||||||
@@ -10,8 +10,8 @@ const CARDS = `${Config.BASE_PATH}/cards/:id`;
|
|||||||
export default {
|
export default {
|
||||||
ROOT,
|
ROOT,
|
||||||
LOGIN,
|
LOGIN,
|
||||||
OIDC_CALLBACK,
|
|
||||||
PROJECTS,
|
PROJECTS,
|
||||||
BOARDS,
|
BOARDS,
|
||||||
CARDS,
|
CARDS,
|
||||||
|
OIDC_LOGIN,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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 isInitializing = selectors.selectIsInitializing(state);
|
const isCoreInitializing = selectors.selectIsCoreInitializing(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,33 +1,23 @@
|
|||||||
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 = (state) => {
|
const mapStateToProps = ({
|
||||||
const oidcConfig = selectors.selectOidcConfig(state);
|
ui: {
|
||||||
|
authenticateForm: { data: defaultData, isSubmitting, error },
|
||||||
const {
|
},
|
||||||
ui: {
|
}) => ({
|
||||||
authenticateForm: { data: defaultData, isSubmitting, isSubmittingUsingOidc, error },
|
defaultData,
|
||||||
},
|
isSubmitting,
|
||||||
} = state;
|
error,
|
||||||
|
});
|
||||||
return {
|
|
||||||
defaultData,
|
|
||||||
isSubmitting,
|
|
||||||
isSubmittingUsingOidc,
|
|
||||||
error,
|
|
||||||
withOidc: !!oidcConfig,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
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,
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
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);
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { bindActionCreators } from 'redux';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
import entryActions from '../entry-actions';
|
||||||
|
import OidcLogin from '../components/OIDC';
|
||||||
|
|
||||||
|
const mapStateToProps = ({
|
||||||
|
ui: {
|
||||||
|
authenticateForm: { data: defaultData, isSubmitting, error },
|
||||||
|
},
|
||||||
|
}) => ({
|
||||||
|
defaultData,
|
||||||
|
isSubmitting,
|
||||||
|
error,
|
||||||
|
});
|
||||||
|
|
||||||
|
const mapDispatchToProps = (dispatch) =>
|
||||||
|
bindActionCreators(
|
||||||
|
{
|
||||||
|
onAuthenticate: entryActions.authenticate,
|
||||||
|
onMessageDismiss: entryActions.clearAuthenticateError,
|
||||||
|
},
|
||||||
|
dispatch,
|
||||||
|
);
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(OidcLogin);
|
||||||
@@ -14,8 +14,8 @@ const mapStateToProps = (state) => {
|
|||||||
phone,
|
phone,
|
||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
|
||||||
isLocked,
|
isLocked,
|
||||||
|
subscribeToOwnCards,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
@@ -30,8 +30,8 @@ const mapStateToProps = (state) => {
|
|||||||
phone,
|
phone,
|
||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
|
||||||
isLocked,
|
isLocked,
|
||||||
|
subscribeToOwnCards,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
|
|||||||
@@ -1,10 +1,16 @@
|
|||||||
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,11 +7,6 @@ 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: {},
|
||||||
@@ -19,6 +14,5 @@ const clearAuthenticateError = () => ({
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
authenticate,
|
authenticate,
|
||||||
authenticateUsingOidc,
|
|
||||||
clearAuthenticateError,
|
clearAuthenticateError,
|
||||||
};
|
};
|
||||||
|
|||||||
+7
-3
@@ -1,11 +1,15 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import ReactDOM from 'react-dom/client';
|
import ReactDOM from 'react-dom/client';
|
||||||
|
|
||||||
|
import Config from './constants/Config';
|
||||||
import store from './store';
|
import store from './store';
|
||||||
import history from './history';
|
import history from './history';
|
||||||
import Root from './components/Root';
|
import Root from './components/Root';
|
||||||
|
|
||||||
import './i18n';
|
import './i18n';
|
||||||
|
|
||||||
const root = ReactDOM.createRoot(document.getElementById('root'));
|
fetch(`${Config.SERVER_BASE_URL}/api/appconfig`).then((response) => {
|
||||||
root.render(React.createElement(Root, { store, history }));
|
response.json().then((config) => {
|
||||||
|
const root = ReactDOM.createRoot(document.getElementById('root'));
|
||||||
|
root.render(React.createElement(Root, { store, history, config }));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -0,0 +1,233 @@
|
|||||||
|
export default {
|
||||||
|
format: {
|
||||||
|
date: 'M/d/yyyy',
|
||||||
|
time: 'p',
|
||||||
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
|
longDate: 'MMM d',
|
||||||
|
longDateTime: "MMMM d 'at' p",
|
||||||
|
},
|
||||||
|
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
aboutPlanka: 'حول بلانكا',
|
||||||
|
account: 'الحساب',
|
||||||
|
actions: 'الإجراءات',
|
||||||
|
addAttachment_title: 'إضافة مرفق',
|
||||||
|
addComment: 'إضافة تعليق',
|
||||||
|
addManager_title: 'إضافة مدير',
|
||||||
|
addMember_title: 'إضافة عضو',
|
||||||
|
addUser_title: 'إضافة مستخدم',
|
||||||
|
administrator: 'المدير',
|
||||||
|
all: 'الكل',
|
||||||
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
|
'سيتم حفظ جميع التغييرات تلقائيًا<br />عند استعادة الاتصال',
|
||||||
|
areYouSureYouWantToDeleteThisAttachment: 'هل أنت متأكد أنك تريد حذف هذا المرفق؟',
|
||||||
|
areYouSureYouWantToDeleteThisBoard: 'هل أنت متأكد أنك تريد حذف هذا اللوح؟',
|
||||||
|
areYouSureYouWantToDeleteThisCard: 'هل أنت متأكد أنك تريد حذف هذه البطاقة؟',
|
||||||
|
areYouSureYouWantToDeleteThisComment: 'هل أنت متأكد أنك تريد حذف هذا التعليق؟',
|
||||||
|
areYouSureYouWantToDeleteThisLabel: 'هل أنت متأكد أنك تريد حذف هذه العلامة؟',
|
||||||
|
areYouSureYouWantToDeleteThisList: 'هل أنت متأكد أنك تريد حذف هذه القائمة؟',
|
||||||
|
areYouSureYouWantToDeleteThisProject: 'هل أنت متأكد أنك تريد حذف هذا المشروع؟',
|
||||||
|
areYouSureYouWantToDeleteThisTask: 'هل أنت متأكد أنك تريد حذف هذه المهمة؟',
|
||||||
|
areYouSureYouWantToDeleteThisUser: 'هل أنت متأكد أنك تريد حذف هذا المستخدم؟',
|
||||||
|
areYouSureYouWantToLeaveBoard: 'هل أنت متأكد أنك تريد مغادرة اللوحة؟',
|
||||||
|
areYouSureYouWantToLeaveProject: 'هل أنت متأكد أنك تريد مغادرة المشروع؟',
|
||||||
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
|
'هل أنت متأكد أنك تريد إزالة هذا المدير من المشروع؟',
|
||||||
|
areYouSureYouWantToRemoveThisMemberFromBoard:
|
||||||
|
'هل أنت متأكد أنك تريد إزالة هذا العضو من اللوحة؟',
|
||||||
|
attachment: 'المرفق',
|
||||||
|
attachments: 'المرفقات',
|
||||||
|
authentication: 'المصادقة',
|
||||||
|
background: 'الخلفية',
|
||||||
|
board: 'اللوحة',
|
||||||
|
boardNotFound_title: 'اللوحة غير موجودة',
|
||||||
|
canComment: 'يمكن التعليق',
|
||||||
|
canEditContentOfBoard: 'يمكن تحرير محتوى اللوحة',
|
||||||
|
canOnlyViewBoard: 'يمكن فقط عرض اللوحة',
|
||||||
|
cardActions_title: 'إجراءات البطاقة',
|
||||||
|
cardNotFound_title: 'البطاقة غير موجودة',
|
||||||
|
cardOrActionAreDeleted: 'تم حذف البطاقة أو الإجراء',
|
||||||
|
color: 'اللون',
|
||||||
|
createBoard_title: 'إنشاء لوحة',
|
||||||
|
createLabel_title: 'إنشاء علامة',
|
||||||
|
createNewOneOrSelectExistingOne: 'إنشاء واحدة جديدة أو اختيار<br />واحدة موجودة بالفعل',
|
||||||
|
createProject_title: 'إنشاء مشروع',
|
||||||
|
createTextFile_title: 'إنشاء ملف نصي',
|
||||||
|
currentPassword: 'كلمة المرور الحالية',
|
||||||
|
dangerZone_title: 'المنطقة الخطرة',
|
||||||
|
date: 'التاريخ',
|
||||||
|
dueDate_title: 'تاريخ الاستحقاق',
|
||||||
|
deleteAttachment_title: 'حذف المرفق',
|
||||||
|
deleteBoard_title: 'حذف اللوحة',
|
||||||
|
deleteCard_title: 'حذف البطاقة',
|
||||||
|
deleteComment_title: 'حذف التعليق',
|
||||||
|
deleteLabel_title: 'حذف العلامة',
|
||||||
|
deleteList_title: 'حذف القائمة',
|
||||||
|
deleteProject_title: 'حذف المشروع',
|
||||||
|
deleteTask_title: 'حذف المهمة',
|
||||||
|
deleteUser_title: 'حذف المستخدم',
|
||||||
|
description: 'الوصف',
|
||||||
|
detectAutomatically: 'الكشف تلقائياً',
|
||||||
|
dropFileToUpload: 'إفلات الملف للتحميل',
|
||||||
|
editor: 'المحرر',
|
||||||
|
editAttachment_title: 'تعديل المرفق',
|
||||||
|
editAvatar_title: 'تعديل الصورة الرمزية',
|
||||||
|
editBoard_title: 'تعديل اللوحة',
|
||||||
|
editDueDate_title: 'تعديل تاريخ الاستحقاق',
|
||||||
|
editEmail_title: 'تعديل البريد الإلكتروني',
|
||||||
|
editInformation_title: 'تعديل المعلومات',
|
||||||
|
editLabel_title: 'تعديل العلامة',
|
||||||
|
editPassword_title: 'تعديل كلمة المرور',
|
||||||
|
editPermissions_title: 'تعديل الصلاحيات',
|
||||||
|
editStopwatch_title: 'تعديل ساعة التوقف',
|
||||||
|
editUsername_title: 'تعديل اسم المستخدم',
|
||||||
|
email: 'البريد الإلكتروني',
|
||||||
|
emailAlreadyInUse: 'البريد الإلكتروني مستخدم بالفعل',
|
||||||
|
enterCardTitle: 'أدخل عنوان البطاقة... [Ctrl+Enter] للفتح التلقائي',
|
||||||
|
enterDescription: 'أدخل الوصف...',
|
||||||
|
enterFilename: 'أدخل اسم الملف',
|
||||||
|
enterListTitle: 'أدخل عنوان القائمة...',
|
||||||
|
enterProjectTitle: 'أدخل عنوان المشروع',
|
||||||
|
enterTaskDescription: 'أدخل وصف المهمة...',
|
||||||
|
filterByLabels_title: 'تصفية حسب العلامات',
|
||||||
|
filterByMembers_title: 'تصفية حسب الأعضاء',
|
||||||
|
fromComputer_title: 'من الكمبيوتر',
|
||||||
|
fromTrello: 'من تريلو',
|
||||||
|
general: 'عام',
|
||||||
|
hours: 'ساعات',
|
||||||
|
importBoard_title: 'استيراد اللوحة',
|
||||||
|
invalidCurrentPassword: 'كلمة المرور الحالية غير صالحة',
|
||||||
|
labels: 'العلامات',
|
||||||
|
language: 'اللغة',
|
||||||
|
leaveBoard_title: 'مغادرة اللوحة',
|
||||||
|
leaveProject_title: 'مغادرة المشروع',
|
||||||
|
list: 'القائمة',
|
||||||
|
listActions_title: 'إجراءات القائمة',
|
||||||
|
managers: 'المديرين',
|
||||||
|
members: 'الأعضاء',
|
||||||
|
minutes: 'دقائق',
|
||||||
|
moveCard_title: 'نقل البطاقة',
|
||||||
|
name: 'الاسم',
|
||||||
|
newEmail: 'البريد الإلكتروني الجديد',
|
||||||
|
newPassword: 'كلمة المرور الجديدة',
|
||||||
|
newUsername: 'اسم المستخدم الجديد',
|
||||||
|
noConnectionToServer: 'لا يوجد اتصال بالخادم',
|
||||||
|
noBoards: 'لا توجد لوحات',
|
||||||
|
noLists: 'لا توجد قوائم',
|
||||||
|
noProjects: 'لا توجد مشاريع',
|
||||||
|
notifications: 'الإشعارات',
|
||||||
|
noUnreadNotifications: 'لا توجد إشعارات غير مقروءة',
|
||||||
|
openBoard_title: 'فتح اللوحة',
|
||||||
|
optional_inline: 'اختياري',
|
||||||
|
organization: 'المنظمة',
|
||||||
|
phone: 'الهاتف',
|
||||||
|
preferences: 'التفضيلات',
|
||||||
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
|
'نصيحة: اضغط على Ctrl-V (Cmd-V على ماك) لإضافة مرفق من الحافظة',
|
||||||
|
project: 'المشروع',
|
||||||
|
projectNotFound_title: 'المشروع غير موجود',
|
||||||
|
removeManager_title: 'إزالة المدير',
|
||||||
|
removeMember_title: 'إزالة العضو',
|
||||||
|
searchLabels: 'البحث في العلامات...',
|
||||||
|
searchMembers: 'البحث في الأعضاء...',
|
||||||
|
searchUsers: 'البحث في المستخدمين...',
|
||||||
|
seconds: 'ثواني',
|
||||||
|
selectBoard: 'اختيار اللوحة',
|
||||||
|
selectList: 'اختيار القائمة',
|
||||||
|
selectPermissions_title: 'اختيار الصلاحيات',
|
||||||
|
selectProject: 'اختيار المشروع',
|
||||||
|
settings: 'الإعدادات',
|
||||||
|
stopwatch: 'ساعة التوقف',
|
||||||
|
subscribeToMyOwnCardsByDefault: 'الاشتراك في بطاقاتي افتراضيًا',
|
||||||
|
taskActions_title: 'إجراءات المهمة',
|
||||||
|
tasks: 'المهام',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment: 'لا يوجد معاينة متاحة لهذا المرفق',
|
||||||
|
time: 'الوقت',
|
||||||
|
title: 'العنوان',
|
||||||
|
userActions_title: 'إجراءات المستخدم',
|
||||||
|
userAddedThisCardToList: '<0>{{user}}</0><1> أضاف هذه البطاقة إلى {{list}}</1>',
|
||||||
|
userLeftNewCommentToCard: '{{user}} ترك تعليقًا جديدًا «{{comment}}» على <2>{{card}}</2>',
|
||||||
|
userMovedCardFromListToList: '{{user}} نقل <2>{{card}}</2> من {{fromList}} إلى {{toList}}',
|
||||||
|
userMovedThisCardFromListToList:
|
||||||
|
'<0>{{user}}</0><1> نقل هذه البطاقة من {{fromList}} إلى {{toList}}</1>',
|
||||||
|
username: 'اسم المستخدم',
|
||||||
|
usernameAlreadyInUse: 'اسم المستخدم مستخدم بالفعل',
|
||||||
|
users: 'المستخدمين',
|
||||||
|
version: 'الإصدار',
|
||||||
|
viewer: 'المشاهد',
|
||||||
|
writeComment: 'كتابة تعليق...',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
addAnotherCard: 'إضافة بطاقة أخرى',
|
||||||
|
addAnotherList: 'إضافة قائمة أخرى',
|
||||||
|
addAnotherTask: 'إضافة مهمة أخرى',
|
||||||
|
addCard: 'إضافة بطاقة',
|
||||||
|
addCard_title: 'إضافة بطاقة',
|
||||||
|
addComment: 'إضافة تعليق',
|
||||||
|
addList: 'إضافة قائمة',
|
||||||
|
addMember: 'إضافة عضو',
|
||||||
|
addMoreDetailedDescription: 'إضافة وصف أكثر تفصيلًا',
|
||||||
|
addTask: 'إضافة مهمة',
|
||||||
|
addToCard: 'إضافة إلى البطاقة',
|
||||||
|
addUser: 'إضافة مستخدم',
|
||||||
|
createBoard: 'إنشاء لوحة',
|
||||||
|
createFile: 'إنشاء ملف',
|
||||||
|
createLabel: 'إنشاء علامة',
|
||||||
|
createNewLabel: 'إنشاء علامة جديدة',
|
||||||
|
createProject: 'إنشاء مشروع',
|
||||||
|
delete: 'حذف',
|
||||||
|
deleteAttachment: 'حذف المرفق',
|
||||||
|
deleteAvatar: 'حذف الصورة الرمزية',
|
||||||
|
deleteBoard: 'حذف اللوحة',
|
||||||
|
deleteCard: 'حذف البطاقة',
|
||||||
|
deleteCard_title: 'حذف البطاقة',
|
||||||
|
deleteComment: 'حذف التعليق',
|
||||||
|
deleteImage: 'حذف الصورة',
|
||||||
|
deleteLabel: 'حذف العلامة',
|
||||||
|
deleteList: 'حذف القائمة',
|
||||||
|
deleteList_title: 'حذف القائمة',
|
||||||
|
deleteProject: 'حذف المشروع',
|
||||||
|
deleteProject_title: 'حذف المشروع',
|
||||||
|
deleteTask: 'حذف المهمة',
|
||||||
|
deleteTask_title: 'حذف المهمة',
|
||||||
|
deleteUser: 'حذف المستخدم',
|
||||||
|
edit: 'تعديل',
|
||||||
|
editDueDate_title: 'تعديل تاريخ الاستحقاق',
|
||||||
|
editDescription_title: 'تعديل الوصف',
|
||||||
|
editEmail_title: 'تعديل البريد الإلكتروني',
|
||||||
|
editInformation_title: 'تعديل المعلومات',
|
||||||
|
editPassword_title: 'تعديل كلمة المرور',
|
||||||
|
editPermissions: 'تعديل الصلاحيات',
|
||||||
|
editStopwatch_title: 'تعديل ساعة التوقف',
|
||||||
|
editTitle_title: 'تعديل العنوان',
|
||||||
|
editUsername_title: 'تعديل اسم المستخدم',
|
||||||
|
hideDetails: 'إخفاء التفاصيل',
|
||||||
|
import: 'استيراد',
|
||||||
|
leaveBoard: 'مغادرة اللوحة',
|
||||||
|
leaveProject: 'مغادرة المشروع',
|
||||||
|
logOut_title: 'تسجيل الخروج',
|
||||||
|
makeCover_title: 'جعلها غلافًا',
|
||||||
|
move: 'نقل',
|
||||||
|
moveCard_title: 'نقل البطاقة',
|
||||||
|
remove: 'إزالة',
|
||||||
|
removeBackground: 'إزالة الخلفية',
|
||||||
|
removeCover_title: 'إزالة الغلاف',
|
||||||
|
removeFromBoard: 'إزالة من اللوحة',
|
||||||
|
removeFromProject: 'إزالة من المشروع',
|
||||||
|
removeManager: 'إزالة المدير',
|
||||||
|
removeMember: 'إزالة العضو',
|
||||||
|
save: 'حفظ',
|
||||||
|
showAllAttachments: 'عرض جميع المرفقات ({{hidden}} مخفية)',
|
||||||
|
showDetails: 'عرض التفاصيل',
|
||||||
|
showFewerAttachments: 'عرض مرفقات أقل',
|
||||||
|
start: 'بدء',
|
||||||
|
stop: 'إيقاف',
|
||||||
|
subscribe: 'الاشتراك',
|
||||||
|
unsubscribe: 'إلغاء الاشتراك',
|
||||||
|
uploadNewAvatar: 'تحميل صورة رمزية جديدة',
|
||||||
|
uploadNewImage: 'تحميل صورة جديدة',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import merge from 'lodash/merge';
|
||||||
|
|
||||||
|
import login from './login';
|
||||||
|
import core from './core';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
language: 'ar',
|
||||||
|
country: 'ar',
|
||||||
|
name: 'Arabic',
|
||||||
|
embeddedLocale: merge(login, core),
|
||||||
|
};
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
export default {
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
emailOrUsername: 'البريد الإلكتروني أو اسم المستخدم',
|
||||||
|
invalidEmailOrUsername: 'بريد إلكتروني أو اسم مستخدم غير صالح',
|
||||||
|
invalidPassword: 'كلمة مرور غير صالحة',
|
||||||
|
logInToPlanka: 'تسجيل الدخول إلى بلانكا',
|
||||||
|
noInternetConnection: 'لا يوجد اتصال بالإنترنت',
|
||||||
|
pageNotFound_title: 'الصفحة غير موجودة',
|
||||||
|
password: 'كلمة المرور',
|
||||||
|
projectManagement: 'إدارة المشروع',
|
||||||
|
serverConnectionFailed: 'فشل الاتصال بالخادم',
|
||||||
|
unknownError: 'خطأ غير معروف، حاول مرة أخرى لاحقًا',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
logIn: 'تسجيل الدخول',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,235 @@
|
|||||||
|
export default {
|
||||||
|
format: {
|
||||||
|
date: 'M/d/yyyy',
|
||||||
|
time: 'p',
|
||||||
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
|
longDate: 'MMM d',
|
||||||
|
longDateTime: "MMMM d 'তে' p",
|
||||||
|
},
|
||||||
|
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
aboutPlanka: 'প্লাঙ্কা সম্পর্কে',
|
||||||
|
account: 'অ্যাকাউন্ট',
|
||||||
|
actions: 'ক্রিয়া',
|
||||||
|
addAttachment_title: 'সংযুক্তি যোগ করুন',
|
||||||
|
addComment: 'মন্তব্য যোগ করুন',
|
||||||
|
addManager_title: 'ম্যানেজার যোগ করুন',
|
||||||
|
addMember_title: 'সদস্য যোগ করুন',
|
||||||
|
addUser_title: 'ব্যবহারকারী যোগ করুন',
|
||||||
|
administrator: 'প্রশাসক',
|
||||||
|
all: 'সব',
|
||||||
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
|
'সমস্ত পরিবর্তন স্বয়ংক্রিয়ভাবে সংরক্ষিত হবে<br />যখন সংযোগ পুনর্স্থাপন হবে',
|
||||||
|
areYouSureYouWantToDeleteThisAttachment:
|
||||||
|
'আপনি কি নিশ্চিত যে আপনি এই সংযুক্তি মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisBoard: 'আপনি কি নিশ্চিত যে আপনি এই বোর্ড মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisCard: 'আপনি কি নিশ্চিত যে আপনি এই কার্ড মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisComment: 'আপনি কি নিশ্চিত যে আপনি এই মন্তব্য মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisLabel: 'আপনি কি নিশ্চিত যে আপনি এই লেবেল মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisList: 'আপনি কি নিশ্চিত যে আপনি এই তালিকা মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisProject: 'আপনি কি নিশ্চিত যে আপনি এই প্রকল্প মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisTask: 'আপনি কি নিশ্চিত যে আপনি এই টাস্ক মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToDeleteThisUser: 'আপনি কি নিশ্চিত যে আপনি এই ব্যবহারকারী মুছে ফেলতে চান?',
|
||||||
|
areYouSureYouWantToLeaveBoard: 'আপনি কি নিশ্চিত যে আপনি বোর্ড ত্যাগ করতে চান?',
|
||||||
|
areYouSureYouWantToLeaveProject: 'আপনি কি নিশ্চিত যে আপনি প্রকল্প ত্যাগ করতে চান?',
|
||||||
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
|
'আপনি কি নিশ্চিত যে আপনি এই প্রকল্প থেকে এই ম্যানেজারকে সরাতে চান?',
|
||||||
|
areYouSureYouWantToRemoveThisMemberFromBoard:
|
||||||
|
'আপনি কি নিশ্চিত যে আপনি এই মেম্বারকে বোর্ড থেকে সরাতে চান?',
|
||||||
|
attachment: 'সংযুক্তি',
|
||||||
|
attachments: 'সংযুক্তিসমূহ',
|
||||||
|
authentication: 'প্রমাণীকরণ',
|
||||||
|
background: 'পেশাদার',
|
||||||
|
board: 'বোর্ড',
|
||||||
|
boardNotFound_title: 'বোর্ড পাওয়া যায়নি',
|
||||||
|
canComment: 'মন্তব্য করতে পারে',
|
||||||
|
canEditContentOfBoard: 'বোর্ডের সামগ্রী সম্পাদনা করতে পারে',
|
||||||
|
canOnlyViewBoard: 'মাত্র বোর্ড দেখতে পারে',
|
||||||
|
cardActions_title: 'কার্ড ক্রিয়াকলাপ',
|
||||||
|
cardNotFound_title: 'কার্ড পাওয়া যায়নি',
|
||||||
|
cardOrActionAreDeleted: 'কার্ড বা ক্রিয়াকলাপ মোছে গেছে',
|
||||||
|
color: 'রং',
|
||||||
|
createBoard_title: 'বোর্ড তৈরি করুন',
|
||||||
|
createLabel_title: 'লেবেল তৈরি করুন',
|
||||||
|
createNewOneOrSelectExistingOne: 'নতুন তৈরি করুন অথবা<br />বিদ্যমান একটি নির্বাচন করুন',
|
||||||
|
createProject_title: 'প্রকল্প তৈরি করুন',
|
||||||
|
createTextFile_title: 'টেক্সট ফাইল তৈরি করুন',
|
||||||
|
currentPassword: 'বর্তমান পাসওয়ার্ড',
|
||||||
|
dangerZone_title: 'আপত্তি জোন',
|
||||||
|
date: 'তারিখ',
|
||||||
|
dueDate_title: 'নির্ধারণিত তারিখ',
|
||||||
|
deleteAttachment_title: 'সংযুক্তি মুছে ফেলুন',
|
||||||
|
deleteBoard_title: 'বোর্ড মুছে ফেলুন',
|
||||||
|
deleteCard_title: 'কার্ড মুছে ফেলুন',
|
||||||
|
deleteComment_title: 'মন্তব্য মুছে ফেলুন',
|
||||||
|
deleteLabel_title: 'লেবেল মুছে ফেলুন',
|
||||||
|
deleteList_title: 'তালিকা মুছে ফেলুন',
|
||||||
|
deleteProject_title: 'প্রকল্প মুছে ফেলুন',
|
||||||
|
deleteTask_title: 'টাস্ক মুছে ফেলুন',
|
||||||
|
deleteUser_title: 'ব্যবহারকারী মুছে ফেলুন',
|
||||||
|
description: 'বর্ণনা',
|
||||||
|
detectAutomatically: 'স্বয়ংক্রিয়ভাবে চেষ্টা করুন',
|
||||||
|
dropFileToUpload: 'আপলোড করার জন্য ফাইল প্রস্থান করুন',
|
||||||
|
editor: 'সম্পাদক',
|
||||||
|
editAttachment_title: 'সংযুক্তি সম্পাদনা করুন',
|
||||||
|
editAvatar_title: 'অবতার সম্পাদনা করুন',
|
||||||
|
editBoard_title: 'বোর্ড সম্পাদনা করুন',
|
||||||
|
editDueDate_title: 'নির্ধারণিত তারিখ সম্পাদনা করুন',
|
||||||
|
editEmail_title: 'ইমেইল সম্পাদনা করুন',
|
||||||
|
editInformation_title: 'তথ্য সম্পাদনা করুন',
|
||||||
|
editLabel_title: 'লেবেল সম্পাদনা করুন',
|
||||||
|
editPassword_title: 'পাসওয়ার্ড সম্পাদনা করুন',
|
||||||
|
editPermissions_title: 'অনুমতি সম্পাদনা করুন',
|
||||||
|
editStopwatch_title: 'স্টপওয়াচ সম্পাদনা করুন',
|
||||||
|
editUsername_title: 'ব্যবহারকারীর নাম সম্পাদনা করুন',
|
||||||
|
email: 'ইমেইল',
|
||||||
|
emailAlreadyInUse: 'ইমেইল ইতিমধ্যে ব্যবহৃত',
|
||||||
|
enterCardTitle: 'কার্ডের শিরোনাম লিখুন... [Ctrl+Enter] দিয়ে স্বয়ংক্রিয়ভাবে খোলুন',
|
||||||
|
enterDescription: 'বর্ণনা লিখুন...',
|
||||||
|
enterFilename: 'ফাইলের নাম লিখুন',
|
||||||
|
enterListTitle: 'তালিকা শিরোনাম লিখুন...',
|
||||||
|
enterProjectTitle: 'প্রকল্পের শিরোনাম লিখুন',
|
||||||
|
enterTaskDescription: 'টাস্কের বর্ণনা লিখুন...',
|
||||||
|
filterByLabels_title: 'লেবেল দ্বারা ছাঁকো',
|
||||||
|
filterByMembers_title: 'সদস্য দ্বারা ছাঁকো',
|
||||||
|
fromComputer_title: 'কম্পিউটার থেকে',
|
||||||
|
fromTrello: 'ট্রেলো থেকে',
|
||||||
|
general: 'সাধারণ',
|
||||||
|
hours: 'ঘণ্টা',
|
||||||
|
importBoard_title: 'বোর্ড আমদানি করুন',
|
||||||
|
invalidCurrentPassword: 'বর্তমান পাসওয়ার্ড অবৈধ',
|
||||||
|
labels: 'লেবেল',
|
||||||
|
language: 'ভাষা',
|
||||||
|
leaveBoard_title: 'বোর্ড ত্যাগ করুন',
|
||||||
|
leaveProject_title: 'প্রকল্প ত্যাগ করুন',
|
||||||
|
list: 'তালিকা',
|
||||||
|
listActions_title: 'তালিকা ক্রিয়াকলাপ',
|
||||||
|
managers: 'ম্যানেজারসমূহ',
|
||||||
|
members: 'সদস্যগণ',
|
||||||
|
minutes: 'মিনিট',
|
||||||
|
moveCard_title: 'কার্ড সরান',
|
||||||
|
name: 'নাম',
|
||||||
|
newEmail: 'নতুন ইমেইল',
|
||||||
|
newPassword: 'নতুন পাসওয়ার্ড',
|
||||||
|
newUsername: 'নতুন ব্যবহারকারীর নাম',
|
||||||
|
noConnectionToServer: 'সার্ভারে সংযোগ নেই',
|
||||||
|
noBoards: 'কোন বোর্ড নেই',
|
||||||
|
noLists: 'কোন তালিকা নেই',
|
||||||
|
noProjects: 'কোন প্রকল্প নেই',
|
||||||
|
notifications: 'বিজ্ঞপ্তি',
|
||||||
|
noUnreadNotifications: 'কোন অপঠিত বিজ্ঞপ্তি নেই',
|
||||||
|
openBoard_title: 'বোর্ড খুলুন',
|
||||||
|
optional_inline: 'ঐচ্ছিক',
|
||||||
|
organization: 'সংগঠন',
|
||||||
|
phone: 'ফোন',
|
||||||
|
preferences: 'পছন্দ',
|
||||||
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
|
'প্রয়োজনীয়: Ctrl-V (Mac উপর Cmd-V) চাপুন যেটাতে ক্লিপবোর্ড থেকে সংযুক্তি যোগ করতে পারবেন',
|
||||||
|
project: 'প্রকল্প',
|
||||||
|
projectNotFound_title: 'প্রকল্প পাওয়া যায়নি',
|
||||||
|
removeManager_title: 'ম্যানেজার সরান',
|
||||||
|
removeMember_title: 'সদস্য সরান',
|
||||||
|
searchLabels: 'লেবেল খুঁজুন...',
|
||||||
|
searchMembers: 'সদস্য খুঁজুন...',
|
||||||
|
searchUsers: 'ব্যবহারকারী খুঁজুন...',
|
||||||
|
seconds: 'সেকেন্ড',
|
||||||
|
selectBoard: 'বোর্ড নির্বাচন করুন',
|
||||||
|
selectList: 'তালিকা নির্বাচন করুন',
|
||||||
|
selectPermissions_title: 'অনুমতি নির্বাচন করুন',
|
||||||
|
selectProject: 'প্রকল্প নির্বাচন করুন',
|
||||||
|
settings: 'সেটিংস',
|
||||||
|
stopwatch: 'স্টপওয়াচ',
|
||||||
|
subscribeToMyOwnCardsByDefault: 'ডিফল্ট অবস্থায় আমার নিজের কার্ডে সাবস্ক্রাইব করুন',
|
||||||
|
taskActions_title: 'টাস্ক ক্রিয়াকলাপ',
|
||||||
|
tasks: 'টাস্কগুলি',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment: 'এই সংযুক্তির জন্য কোন পূর্বরূপ নেই',
|
||||||
|
time: 'সময়',
|
||||||
|
title: 'শিরোনাম',
|
||||||
|
userActions_title: 'ব্যবহারকারী ক্রিয়াকলাপ',
|
||||||
|
userAddedThisCardToList: '<0>{{user}}</0><1> {{list}} তে এই কার্ড যোগ করেছেন</1>',
|
||||||
|
userLeftNewCommentToCard: '{{user}} নতুন মন্তব্য ছেড়েছেন «{{comment}}» <2>{{card}}</2> এ',
|
||||||
|
userMovedCardFromListToList:
|
||||||
|
'{{user}} <2>{{card}}</2> মোব করেছেন {{fromList}} থেকে {{toList}} এ',
|
||||||
|
userMovedThisCardFromListToList:
|
||||||
|
'<0>{{user}}</0><1> {{fromList}} থেকে {{toList}} এ এই কার্ড মোব করেছেন</1>',
|
||||||
|
username: 'ব্যবহারকারীর নাম',
|
||||||
|
usernameAlreadyInUse: 'ব্যবহারকারীর নাম ইতিমধ্যে ব্যবহৃত',
|
||||||
|
users: 'ব্যবহারকারীগণ',
|
||||||
|
version: 'সংস্করণ',
|
||||||
|
viewer: 'দর্শক',
|
||||||
|
writeComment: 'মন্তব্য লিখুন...',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
addAnotherCard: 'আরেকটি কার্ড যোগ করুন',
|
||||||
|
addAnotherList: 'আরেকটি তালিকা যোগ করুন',
|
||||||
|
addAnotherTask: 'আরেকটি টাস্ক যোগ করুন',
|
||||||
|
addCard: 'কার্ড যোগ করুন',
|
||||||
|
addCard_title: 'কার্ড যোগ করুন',
|
||||||
|
addComment: 'মন্তব্য যোগ করুন',
|
||||||
|
addList: 'তালিকা যোগ করুন',
|
||||||
|
addMember: 'সদস্য যোগ করুন',
|
||||||
|
addMoreDetailedDescription: 'আরও বিস্তারিত বর্ণনা যোগ করুন',
|
||||||
|
addTask: 'টাস্ক যোগ করুন',
|
||||||
|
addToCard: 'কার্ডে যোগ করুন',
|
||||||
|
addUser: 'ব্যবহারকারী যোগ করুন',
|
||||||
|
createBoard: 'বোর্ড তৈরি করুন',
|
||||||
|
createFile: 'ফাইল তৈরি করুন',
|
||||||
|
createLabel: 'লেবেল তৈরি করুন',
|
||||||
|
createNewLabel: 'নতুন লেবেল তৈরি করুন',
|
||||||
|
createProject: 'প্রকল্প তৈরি করুন',
|
||||||
|
delete: 'মুছে ফেলুন',
|
||||||
|
deleteAttachment: 'সংযুক্তি মুছে ফেলুন',
|
||||||
|
deleteAvatar: 'অবতার মুছে ফেলুন',
|
||||||
|
deleteBoard: 'বোর্ড মুছে ফেলুন',
|
||||||
|
deleteCard: 'কার্ড মুছে ফেলুন',
|
||||||
|
deleteCard_title: 'কার্ড মুছে ফেলুন',
|
||||||
|
deleteComment: 'মন্তব্য মুছে ফেলুন',
|
||||||
|
deleteImage: 'চিত্র মুছে ফেলুন',
|
||||||
|
deleteLabel: 'লেবেল মুছে ফেলুন',
|
||||||
|
deleteList: 'তালিকা মুছে ফেলুন',
|
||||||
|
deleteList_title: 'তালিকা মুছে ফেলুন',
|
||||||
|
deleteProject: 'প্রকল্প মুছে ফেলুন',
|
||||||
|
deleteProject_title: 'প্রকল্প মুছে ফেলুন',
|
||||||
|
deleteTask: 'টাস্ক মুছে ফেলুন',
|
||||||
|
deleteTask_title: 'টাস্ক মুছে ফেলুন',
|
||||||
|
deleteUser: 'ব্যবহারকারী মুছে ফেলুন',
|
||||||
|
edit: 'সম্পাদনা করুন',
|
||||||
|
editDueDate_title: 'নির্ধারণিত তারিখ সম্পাদনা করুন',
|
||||||
|
editDescription_title: 'বর্ণনা সম্পাদনা করুন',
|
||||||
|
editEmail_title: 'ইমেইল সম্পাদনা করুন',
|
||||||
|
editInformation_title: 'তথ্য সম্পাদনা করুন',
|
||||||
|
editPassword_title: 'পাসওয়ার্ড সম্পাদনা করুন',
|
||||||
|
editPermissions: 'অনুমতি সম্পাদনা করুন',
|
||||||
|
editStopwatch_title: 'স্টপওয়াচ সম্পাদনা করুন',
|
||||||
|
editTitle_title: 'শিরোনাম সম্পাদনা করুন',
|
||||||
|
editUsername_title: 'ব্যবহারকারীর নাম সম্পাদনা করুন',
|
||||||
|
hideDetails: 'বিশদ লুকান',
|
||||||
|
import: 'আমদানি করুন',
|
||||||
|
leaveBoard: 'বোর্ড ত্যাগ করুন',
|
||||||
|
leaveProject: 'প্রকল্প ত্যাগ করুন',
|
||||||
|
logOut_title: 'লগ আউট',
|
||||||
|
makeCover_title: 'কভার তৈরি করুন',
|
||||||
|
move: 'সরান',
|
||||||
|
moveCard_title: 'কার্ড সরান',
|
||||||
|
remove: 'সরান',
|
||||||
|
removeBackground: 'পেশাদার সরান',
|
||||||
|
removeCover_title: 'কভার সরান',
|
||||||
|
removeFromBoard: 'বোর্ড থেকে সরান',
|
||||||
|
removeFromProject: 'প্রকল্প থেকে সরান',
|
||||||
|
removeManager: 'ম্যানেজার সরান',
|
||||||
|
removeMember: 'সদস্য সরান',
|
||||||
|
save: 'সংরক্ষণ করুন',
|
||||||
|
showAllAttachments: 'সমস্ত সংযুক্তিসমূহ দেখান ({{hidden}} লুকান)',
|
||||||
|
showDetails: 'বিশদ দেখান',
|
||||||
|
showFewerAttachments: 'কম সংযুক্তি দেখান',
|
||||||
|
start: 'শুরু',
|
||||||
|
stop: 'বন্ধ',
|
||||||
|
subscribe: 'সাবস্ক্রাইব করুন',
|
||||||
|
unsubscribe: 'সাবস্ক্রাইব বাতিল করুন',
|
||||||
|
uploadNewAvatar: 'নতুন অবতার আপলোড করুন',
|
||||||
|
uploadNewImage: 'নতুন চিত্র আপলোড করুন',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import merge from 'lodash/merge';
|
||||||
|
|
||||||
|
import login from './login';
|
||||||
|
import core from './core';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
language: 'bn',
|
||||||
|
country: 'bn',
|
||||||
|
name: 'Bengali',
|
||||||
|
embeddedLocale: merge(login, core),
|
||||||
|
};
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
export default {
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
emailOrUsername: 'ইমেইল বা ব্যবহারকারীর নাম',
|
||||||
|
invalidEmailOrUsername: 'অবৈধ ইমেইল বা ব্যবহারকারীর নাম',
|
||||||
|
invalidPassword: 'অবৈধ পাসওয়ার্ড',
|
||||||
|
logInToPlanka: 'Planka-তে লগ ইন করুন',
|
||||||
|
noInternetConnection: 'ইন্টারনেট সংযোগ নেই',
|
||||||
|
pageNotFound_title: 'পেজ পাওয়া যায়নি',
|
||||||
|
password: 'পাসওয়ার্ড',
|
||||||
|
projectManagement: 'প্রকল্প পরিচালনা',
|
||||||
|
serverConnectionFailed: 'সার্ভার সংযোগ ব্যর্থ হয়েছে',
|
||||||
|
unknownError: 'অজানা ত্রুটি, পরে আবার চেষ্টা করুন',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
logIn: 'লগ ইন করুন',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -11,12 +11,10 @@ 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',
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,236 @@
|
|||||||
|
export default {
|
||||||
|
format: {
|
||||||
|
date: 'd/M/yyyy',
|
||||||
|
time: 'A',
|
||||||
|
dateTime: '$t(format:date), $t(format:time)',
|
||||||
|
longDate: 'd MMM',
|
||||||
|
longDateTime: "d MMMM 'को' $t(format:time)",
|
||||||
|
},
|
||||||
|
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
aboutPlanka: 'Planka के बारे में',
|
||||||
|
account: 'खाता',
|
||||||
|
actions: 'क्रियाएँ',
|
||||||
|
addAttachment_title: 'अटैचमेंट जोड़ें',
|
||||||
|
addComment: 'टिप्पणी जोड़ें',
|
||||||
|
addManager_title: 'मैनेजर जोड़ें',
|
||||||
|
addMember_title: 'सदस्य जोड़ें',
|
||||||
|
addUser_title: 'उपयोगकर्ता जोड़ें',
|
||||||
|
administrator: 'प्रशासक',
|
||||||
|
all: 'सभी',
|
||||||
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
|
'सभी परिवर्तन अपने आप सहेजे जाएंगे<br />कनेक्शन बहाल होने के बाद',
|
||||||
|
areYouSureYouWantToDeleteThisAttachment: 'क्या आप वाकई इस अटैचमेंट को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisBoard: 'क्या आप वाकई इस बोर्ड को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisCard: 'क्या आप वाकई इस कार्ड को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisComment: 'क्या आप वाकई इस टिप्पणी को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisLabel: 'क्या आप वाकई इस लेबल को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisList: 'क्या आप वाकई इस सूची को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisProject: 'क्या आप वाकई इस परियोजना को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisTask: 'क्या आप वाकई इस कार्य को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToDeleteThisUser: 'क्या आप वाकई इस उपयोगकर्ता को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToLeaveBoard: 'क्या आप वाकई इस बोर्ड को छोड़ना चाहते हैं?',
|
||||||
|
areYouSureYouWantToLeaveProject: 'क्या आप वाकई इस परियोजना को छोड़ना चाहते हैं?',
|
||||||
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
|
'क्या आप वाकई इस परियोजना से इस मैनेजर को हटाना चाहते हैं?',
|
||||||
|
areYouSureYouWantToRemoveThisMemberFromBoard:
|
||||||
|
'क्या आप वाकई इस बोर्ड से इस सदस्य को हटाना चाहते हैं?',
|
||||||
|
attachment: 'अटैचमेंट',
|
||||||
|
attachments: 'अटैचमेंट्स',
|
||||||
|
authentication: 'प्रमाणीकरण',
|
||||||
|
background: 'पृष्ठभूमि',
|
||||||
|
board: 'बोर्ड',
|
||||||
|
boardNotFound_title: 'बोर्ड नहीं मिला',
|
||||||
|
canComment: 'टिप्पणी कर सकते हैं',
|
||||||
|
canEditContentOfBoard: 'बोर्ड की सामग्री को संपादित कर सकते हैं',
|
||||||
|
canOnlyViewBoard: 'केवल बोर्ड देख सकते हैं',
|
||||||
|
cardActions_title: 'कार्ड क्रियाएँ',
|
||||||
|
cardNotFound_title: 'कार्ड नहीं मिला',
|
||||||
|
cardOrActionAreDeleted: 'कार्ड या क्रिया हटा दी गई हैं',
|
||||||
|
color: 'रंग',
|
||||||
|
createBoard_title: 'बोर्ड बनाएं',
|
||||||
|
createLabel_title: 'लेबल बनाएं',
|
||||||
|
createNewOneOrSelectExistingOne: 'नया बनाएं या<br />मौजूदा चुनें',
|
||||||
|
createProject_title: 'परियोजना बनाएं',
|
||||||
|
createTextFile_title: 'टेक्स्ट फ़ाइल बनाएं',
|
||||||
|
currentPassword: 'वर्तमान पासवर्ड',
|
||||||
|
dangerZone_title: 'खतरे का क्षेत्र',
|
||||||
|
date: 'तारीख',
|
||||||
|
dueDate_title: 'नियत तारीख',
|
||||||
|
deleteAttachment_title: 'अटैचमेंट हटाएं',
|
||||||
|
deleteBoard_title: 'बोर्ड हटाएं',
|
||||||
|
deleteCard_title: 'कार्ड हटाएं',
|
||||||
|
deleteComment_title: 'टिप्पणी हटाएं',
|
||||||
|
deleteLabel_title: 'लेबल हटाएं',
|
||||||
|
deleteList_title: 'सूची हटाएं',
|
||||||
|
deleteProject_title: 'परियोजना हटाएं',
|
||||||
|
deleteTask_title: 'कार्य हटाएं',
|
||||||
|
deleteUser_title: 'उपयोगकर्ता हटाएं',
|
||||||
|
description: 'विवरण',
|
||||||
|
detectAutomatically: 'स्वचालित खोजें',
|
||||||
|
dropFileToUpload: 'अपलोड करने के लिए फ़ाइल छोड़ें',
|
||||||
|
editor: 'संपादक',
|
||||||
|
editAttachment_title: 'अटैचमेंट संपादित करें',
|
||||||
|
editAvatar_title: 'अवतार संपादित करें',
|
||||||
|
editBoard_title: 'बोर्ड संपादित करें',
|
||||||
|
editDueDate_title: 'नियत तारीख संपादित करें',
|
||||||
|
editEmail_title: 'ईमेल संपादित करें',
|
||||||
|
editInformation_title: 'जानकारी संपादित करें',
|
||||||
|
editLabel_title: 'लेबल संपादित करें',
|
||||||
|
editPassword_title: 'पासवर्ड संपादित करें',
|
||||||
|
editPermissions_title: 'अनुमतियाँ संपादित करें',
|
||||||
|
editStopwatch_title: 'स्टॉपवॉच संपादित करें',
|
||||||
|
editUsername_title: 'उपयोगकर्ता नाम संपादित करें',
|
||||||
|
email: 'ईमेल',
|
||||||
|
emailAlreadyInUse: 'ईमेल पहले से उपयोग में है',
|
||||||
|
enterCardTitle: 'कार्ड शीर्षक दर्ज करें... [Ctrl+Enter] ऑटो-खुला करने के लिए',
|
||||||
|
enterDescription: 'विवरण दर्ज करें...',
|
||||||
|
enterFilename: 'फ़ाइल का नाम दर्ज करें',
|
||||||
|
enterListTitle: 'सूची का शीर्षक दर्ज करें...',
|
||||||
|
enterProjectTitle: 'परियोजना का शीर्षक दर्ज करें',
|
||||||
|
enterTaskDescription: 'कार्य का विवरण दर्ज करें...',
|
||||||
|
filterByLabels_title: 'लेबल से फ़िल्टर करें',
|
||||||
|
filterByMembers_title: 'सदस्यों से फ़िल्टर करें',
|
||||||
|
fromComputer_title: 'कंप्यूटर से',
|
||||||
|
fromTrello: 'Trello से',
|
||||||
|
general: 'सामान्य',
|
||||||
|
hours: 'घंटे',
|
||||||
|
importBoard_title: 'बोर्ड आयात करें',
|
||||||
|
invalidCurrentPassword: 'अमान्य वर्तमान पासवर्ड',
|
||||||
|
labels: 'लेबल',
|
||||||
|
language: 'भाषा',
|
||||||
|
leaveBoard_title: 'बोर्ड छोड़ें',
|
||||||
|
leaveProject_title: 'परियोजना छोड़ें',
|
||||||
|
list: 'सूची',
|
||||||
|
listActions_title: 'सूची क्रियाएँ',
|
||||||
|
managers: 'मैनेजर',
|
||||||
|
members: 'सदस्य',
|
||||||
|
minutes: 'मिनट',
|
||||||
|
moveCard_title: 'कार्ड को ले जाएं',
|
||||||
|
name: 'नाम',
|
||||||
|
newEmail: 'नई ईमेल',
|
||||||
|
newPassword: 'नया पासवर्ड',
|
||||||
|
newUsername: 'नया उपयोगकर्ता नाम',
|
||||||
|
noConnectionToServer: 'सर्वर से कोई जुड़ाव नहीं है',
|
||||||
|
noBoards: 'कोई बोर्ड नहीं',
|
||||||
|
noLists: 'कोई सूची नहीं',
|
||||||
|
noProjects: 'कोई परियोजनाएँ नहीं',
|
||||||
|
notifications: 'सूचनाएँ',
|
||||||
|
noUnreadNotifications: 'कोई अपठित सूचनाएँ नहीं हैं',
|
||||||
|
openBoard_title: 'बोर्ड खोलें',
|
||||||
|
optional_inline: 'वैकल्पिक',
|
||||||
|
organization: 'संगठन',
|
||||||
|
phone: 'फ़ोन',
|
||||||
|
preferences: 'प्राथमिकताएँ',
|
||||||
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
|
'सुझाव: क्लिपबोर्ड से अटैचमेंट जोड़ने के लिए Ctrl-V (Mac पर Cmd-V) दबाएं',
|
||||||
|
project: 'परियोजना',
|
||||||
|
projectNotFound_title: 'परियोजना नहीं मिली',
|
||||||
|
removeManager_title: 'मैनेजर हटाएं',
|
||||||
|
removeMember_title: 'सदस्य हटाएं',
|
||||||
|
searchLabels: 'लेबल खोजें...',
|
||||||
|
searchMembers: 'सदस्य खोजें...',
|
||||||
|
searchUsers: 'उपयोगकर्ताओं को खोजें...',
|
||||||
|
seconds: 'सेकंड्स',
|
||||||
|
selectBoard: 'बोर्ड चुनें',
|
||||||
|
selectList: 'सूची चुनें',
|
||||||
|
selectPermissions_title: 'अनुमतियाँ चुनें',
|
||||||
|
selectProject: 'परियोजना चुनें',
|
||||||
|
settings: 'सेटिंग्स',
|
||||||
|
stopwatch: 'स्टॉपवॉच',
|
||||||
|
subscribeToMyOwnCardsByDefault: 'डिफ़ॉल्ट रूप से मेरे अपने कार्डों की सदस्यता लें',
|
||||||
|
taskActions_title: 'कार्य क्रियाएँ',
|
||||||
|
tasks: 'कार्य',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment:
|
||||||
|
'इस अटैचमेंट के लिए कोई पूर्वावलोकन उपलब्ध नहीं है',
|
||||||
|
time: 'समय',
|
||||||
|
title: 'शीर्षक',
|
||||||
|
userActions_title: 'उपयोगकर्ता क्रियाएँ',
|
||||||
|
userAddedThisCardToList: '<0>{{user}}</0><1> ने इस कार्ड को {{list}} में जोड़ा</1>',
|
||||||
|
userLeftNewCommentToCard:
|
||||||
|
'{{user}} ने कार्ड <2>{{card}}</2> पर नई टिप्पणी छोड़ी «{{comment}}»',
|
||||||
|
userMovedCardFromListToList:
|
||||||
|
'{{user}} ने <2>{{card}}</2> को {{fromList}} से {{toList}} में मूव किया',
|
||||||
|
userMovedThisCardFromListToList:
|
||||||
|
'<0>{{user}}</0><1> ने इस कार्ड को {{fromList}} से {{toList}} में मूव किया</1>',
|
||||||
|
username: 'उपयोगकर्ता नाम',
|
||||||
|
usernameAlreadyInUse: 'उपयोगकर्ता नाम पहले से उपयोग में है',
|
||||||
|
users: 'उपयोगकर्ताओं',
|
||||||
|
version: 'संस्करण',
|
||||||
|
viewer: 'दर्शक',
|
||||||
|
writeComment: 'टिप्पणी लिखें...',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
addAnotherCard: 'एक और कार्ड जोड़ें',
|
||||||
|
addAnotherList: 'एक और सूची जोड़ें',
|
||||||
|
addAnotherTask: 'एक और कार्य जोड़ें',
|
||||||
|
addCard: 'कार्ड जोड़ें',
|
||||||
|
addCard_title: 'कार्ड जोड़ें',
|
||||||
|
addComment: 'टिप्पणी जोड़ें',
|
||||||
|
addList: 'सूची जोड़ें',
|
||||||
|
addMember: 'सदस्य जोड़ें',
|
||||||
|
addMoreDetailedDescription: 'अधिक विस्तारित विवरण जोड़ें',
|
||||||
|
addTask: 'कार्य जोड़ें',
|
||||||
|
addToCard: 'कार्ड में जोड़ें',
|
||||||
|
addUser: 'उपयोगकर्ता जोड़ें',
|
||||||
|
createBoard: 'बोर्ड बनाएं',
|
||||||
|
createFile: 'फ़ाइल बनाएं',
|
||||||
|
createLabel: 'लेबल बनाएं',
|
||||||
|
createNewLabel: 'नई लेबल बनाएं',
|
||||||
|
createProject: 'परियोजना बनाएं',
|
||||||
|
delete: 'हटाएं',
|
||||||
|
deleteAttachment: 'अटैचमेंट हटाएं',
|
||||||
|
deleteAvatar: 'अवतार हटाएं',
|
||||||
|
deleteBoard: 'बोर्ड हटाएं',
|
||||||
|
deleteCard: 'कार्ड हटाएं',
|
||||||
|
deleteCard_title: 'कार्ड हटाएं',
|
||||||
|
deleteComment: 'टिप्पणी हटाएं',
|
||||||
|
deleteImage: 'छवि हटाएं',
|
||||||
|
deleteLabel: 'लेबल हटाएं',
|
||||||
|
deleteList: 'सूची हटाएं',
|
||||||
|
deleteList_title: 'सूची हटाएं',
|
||||||
|
deleteProject: 'परियोजना हटाएं',
|
||||||
|
deleteProject_title: 'परियोजना हटाएं',
|
||||||
|
deleteTask: 'कार्य हटाएं',
|
||||||
|
deleteTask_title: 'कार्य हटाएं',
|
||||||
|
deleteUser: 'उपयोगकर्ता हटाएं',
|
||||||
|
edit: 'संपादित करें',
|
||||||
|
editDueDate_title: 'नियत तारीख संपादित करें',
|
||||||
|
editDescription_title: 'विवरण संपादित करें',
|
||||||
|
editEmail_title: 'ईमेल संपादित करें',
|
||||||
|
editInformation_title: 'जानकारी संपादित करें',
|
||||||
|
editPassword_title: 'पासवर्ड संपादित करें',
|
||||||
|
editPermissions: 'अनुमतियाँ संपादित करें',
|
||||||
|
editStopwatch_title: 'स्टॉपवॉच संपादित करें',
|
||||||
|
editTitle_title: 'शीर्षक संपादित करें',
|
||||||
|
editUsername_title: 'उपयोगकर्ता नाम संपादित करें',
|
||||||
|
hideDetails: 'विवरण छुपाएं',
|
||||||
|
import: 'आयात करें',
|
||||||
|
leaveBoard: 'बोर्ड छोड़ें',
|
||||||
|
leaveProject: 'परियोजना छोड़ें',
|
||||||
|
logOut_title: 'लॉग आउट',
|
||||||
|
makeCover_title: 'कवर बनाएं',
|
||||||
|
move: 'मूव करें',
|
||||||
|
moveCard_title: 'कार्ड को ले जाएं',
|
||||||
|
remove: 'हटाएं',
|
||||||
|
removeBackground: 'पृष्ठभूमि हटाएं',
|
||||||
|
removeCover_title: 'कवर हटाएं',
|
||||||
|
removeFromBoard: 'बोर्ड से हटाएं',
|
||||||
|
removeFromProject: 'परियोजना से हटाएं',
|
||||||
|
removeManager: 'मैनेजर हटाएं',
|
||||||
|
removeMember: 'सदस्य हटाएं',
|
||||||
|
save: 'सहेजें',
|
||||||
|
showAllAttachments: 'सभी अटैचमेंट दिखाएं ({{hidden}} छुपे हुए)',
|
||||||
|
showDetails: 'विवरण दिखाएं',
|
||||||
|
showFewerAttachments: 'कम अटैचमेंट दिखाएं',
|
||||||
|
start: 'शुरू करें',
|
||||||
|
stop: 'रोकें',
|
||||||
|
subscribe: 'सदस्यता लें',
|
||||||
|
unsubscribe: 'सदस्यता रद्द करें',
|
||||||
|
uploadNewAvatar: 'नया अवतार अपलोड करें',
|
||||||
|
uploadNewImage: 'नई छवि अपलोड करें',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import merge from 'lodash/merge';
|
||||||
|
|
||||||
|
import login from './login';
|
||||||
|
import core from './core';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
language: 'hi',
|
||||||
|
country: 'hi',
|
||||||
|
name: 'Hindi',
|
||||||
|
embeddedLocale: merge(login, core),
|
||||||
|
};
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
export default {
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
emailOrUsername: 'ईमेल या उपयोगकर्ता नाम',
|
||||||
|
invalidEmailOrUsername: 'अवैध ईमेल या उपयोगकर्ता नाम',
|
||||||
|
invalidPassword: 'अवैध पासवर्ड',
|
||||||
|
logInToPlanka: 'Planka में लॉग इन करें',
|
||||||
|
noInternetConnection: 'कोई इंटरनेट कनेक्शन नहीं',
|
||||||
|
pageNotFound_title: 'पृष्ठ नहीं मिला',
|
||||||
|
password: 'पासवर्ड',
|
||||||
|
projectManagement: 'परियोजना प्रबंधन',
|
||||||
|
serverConnectionFailed: 'सर्वर कनेक्शन विफल हो गया',
|
||||||
|
unknownError: 'अज्ञात त्रुटि, बाद में पुनः प्रयास करें',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
logIn: 'लॉग इन करें',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -1,12 +1,16 @@
|
|||||||
|
import ar from './ar';
|
||||||
|
import bn from './bn';
|
||||||
import cs from './cs';
|
import cs from './cs';
|
||||||
import da from './da';
|
import da from './da';
|
||||||
import de from './de';
|
import de from './de';
|
||||||
import en from './en';
|
import en from './en';
|
||||||
import es from './es';
|
import es from './es';
|
||||||
import fr from './fr';
|
import fr from './fr';
|
||||||
|
import hi from './hi';
|
||||||
import it from './it';
|
import it from './it';
|
||||||
import ja from './ja';
|
import ja from './ja';
|
||||||
import ko from './ko';
|
import ko from './ko';
|
||||||
|
import nl from './nl';
|
||||||
import pl from './pl';
|
import pl from './pl';
|
||||||
import ru from './ru';
|
import ru from './ru';
|
||||||
import sk from './sk';
|
import sk from './sk';
|
||||||
@@ -15,7 +19,7 @@ import tr from './tr';
|
|||||||
import uz from './uz';
|
import uz from './uz';
|
||||||
import zh from './zh';
|
import zh from './zh';
|
||||||
|
|
||||||
const locales = [cs, da, de, en, es, fr, it, ja, ko, pl, ru, sk, sv, tr, uz, zh];
|
const locales = [ar, bn, cs, da, de, en, es, fr, hi, it, ja, ko, nl, pl, ru, sk, sv, tr, uz, zh];
|
||||||
|
|
||||||
export default locales;
|
export default locales;
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export default {
|
|||||||
time: 'HH:mm',
|
time: 'HH:mm',
|
||||||
dateTime: '$t(format:date) $t(format:time)',
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
longDate: 'MMMMd日',
|
longDate: 'MMMMd日',
|
||||||
longDateTime: "MMMMd'日 ' HH:mm",
|
longDateTime: "MMMMd'日 ' HH:MM",
|
||||||
},
|
},
|
||||||
|
|
||||||
translation: {
|
translation: {
|
||||||
|
|||||||
Executable
+236
@@ -0,0 +1,236 @@
|
|||||||
|
export default {
|
||||||
|
format: {
|
||||||
|
date: 'd-M-yyyy',
|
||||||
|
time: 'HH:mm',
|
||||||
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
|
longDate: 'd MMM',
|
||||||
|
longDateTime: "d MMMM 'om' HH:mm",
|
||||||
|
},
|
||||||
|
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
aboutPlanka: 'Over Planka',
|
||||||
|
account: 'Account',
|
||||||
|
actions: 'Acties',
|
||||||
|
addAttachment_title: 'Bijlage Toevoegen',
|
||||||
|
addComment: 'Opmerking Toevoegen',
|
||||||
|
addManager_title: 'Manager Toevoegen',
|
||||||
|
addMember_title: 'Lid Toevoegen',
|
||||||
|
addUser_title: 'Gebruiker Toevoegen',
|
||||||
|
administrator: 'Beheerder',
|
||||||
|
all: 'Alles',
|
||||||
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
|
'Alle wijzigingen worden automatisch opgeslagen<br />nadat de verbinding is hersteld',
|
||||||
|
areYouSureYouWantToDeleteThisAttachment: 'Weet u zeker dat u deze bijlage wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisBoard: 'Weet u zeker dat u dit bord wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisCard: 'Weet u zeker dat u deze kaart wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisComment: 'Weet u zeker dat u deze opmerking wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisLabel: 'Weet u zeker dat u deze label wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisList: 'Weet u zeker dat u deze lijst wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisProject: 'Weet u zeker dat u dit project wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisTask: 'Weet u zeker dat u deze taak wilt verwijderen?',
|
||||||
|
areYouSureYouWantToDeleteThisUser: 'Weet u zeker dat u deze gebruiker wilt verwijderen?',
|
||||||
|
areYouSureYouWantToLeaveBoard: 'Weet u zeker dat u het bord wilt verlaten?',
|
||||||
|
areYouSureYouWantToLeaveProject: 'Weet u zeker dat u het project wilt verlaten?',
|
||||||
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
|
'Weet u zeker dat u deze manager uit het project wilt verwijderen?',
|
||||||
|
areYouSureYouWantToRemoveThisMemberFromBoard:
|
||||||
|
'Weet u zeker dat u dit lid uit het bord wilt verwijderen?',
|
||||||
|
attachment: 'Bijlage',
|
||||||
|
attachments: 'Bijlagen',
|
||||||
|
authentication: 'Authenticatie',
|
||||||
|
background: 'Achtergrond',
|
||||||
|
board: 'Bord',
|
||||||
|
boardNotFound_title: 'Bord Niet Gevonden',
|
||||||
|
canComment: 'Kan opmerking plaatsen',
|
||||||
|
canEditContentOfBoard: 'Kan de inhoud van het bord bewerken',
|
||||||
|
canOnlyViewBoard: 'Kan alleen het bord bekijken',
|
||||||
|
cardActions_title: 'Kaartacties',
|
||||||
|
cardNotFound_title: 'Kaart Niet Gevonden',
|
||||||
|
cardOrActionAreDeleted: 'Kaart of actie zijn verwijderd',
|
||||||
|
color: 'Kleur',
|
||||||
|
createBoard_title: 'Bord Aanmaken',
|
||||||
|
createLabel_title: 'Label Aanmaken',
|
||||||
|
createNewOneOrSelectExistingOne: 'Maak een nieuwe aan of selecteer<br />een bestaande',
|
||||||
|
createProject_title: 'Project Aanmaken',
|
||||||
|
createTextFile_title: 'Tekstbestand Aanmaken',
|
||||||
|
currentPassword: 'Huidig wachtwoord',
|
||||||
|
dangerZone_title: 'Gevaarlijke Zone',
|
||||||
|
date: 'Datum',
|
||||||
|
dueDate_title: 'Vervaldatum',
|
||||||
|
deleteAttachment_title: 'Bijlage Verwijderen',
|
||||||
|
deleteBoard_title: 'Bord Verwijderen',
|
||||||
|
deleteCard_title: 'Kaart Verwijderen',
|
||||||
|
deleteComment_title: 'Opmerking Verwijderen',
|
||||||
|
deleteLabel_title: 'Label Verwijderen',
|
||||||
|
deleteList_title: 'Lijst Verwijderen',
|
||||||
|
deleteProject_title: 'Project Verwijderen',
|
||||||
|
deleteTask_title: 'Taak Verwijderen',
|
||||||
|
deleteUser_title: 'Gebruiker Verwijderen',
|
||||||
|
description: 'Beschrijving',
|
||||||
|
detectAutomatically: 'Automatisch detecteren',
|
||||||
|
dropFileToUpload: 'Sleep het bestand om te uploaden',
|
||||||
|
editor: 'Editor',
|
||||||
|
editAttachment_title: 'Bijlage Bewerken',
|
||||||
|
editAvatar_title: 'Avatar Bewerken',
|
||||||
|
editBoard_title: 'Bord Bewerken',
|
||||||
|
editDueDate_title: 'Vervaldatum Bewerken',
|
||||||
|
editEmail_title: 'E-mail Bewerken',
|
||||||
|
editInformation_title: 'Informatie Bewerken',
|
||||||
|
editLabel_title: 'Label Bewerken',
|
||||||
|
editPassword_title: 'Wachtwoord Bewerken',
|
||||||
|
editPermissions_title: 'Rechten Bewerken',
|
||||||
|
editStopwatch_title: 'Stopwatch Bewerken',
|
||||||
|
editUsername_title: 'Gebruikersnaam Bewerken',
|
||||||
|
email: 'E-mail',
|
||||||
|
emailAlreadyInUse: 'E-mail is al in gebruik',
|
||||||
|
enterCardTitle: 'Voer de kaarttitel in... [Ctrl+Enter] om automatisch te openen',
|
||||||
|
enterDescription: 'Voer beschrijving in...',
|
||||||
|
enterFilename: 'Voer bestandsnaam in',
|
||||||
|
enterListTitle: 'Voer de lijsttitel in...',
|
||||||
|
enterProjectTitle: 'Voer de projecttitel in',
|
||||||
|
enterTaskDescription: 'Voer taakbeschrijving in...',
|
||||||
|
filterByLabels_title: 'Filteren op Labels',
|
||||||
|
filterByMembers_title: 'Filteren op Leden',
|
||||||
|
fromComputer_title: 'Van Computer',
|
||||||
|
fromTrello: 'Van Trello',
|
||||||
|
general: 'Algemeen',
|
||||||
|
hours: 'Uren',
|
||||||
|
importBoard_title: 'Bord Importeren',
|
||||||
|
invalidCurrentPassword: 'Ongeldig huidig wachtwoord',
|
||||||
|
labels: 'Labels',
|
||||||
|
language: 'Taal',
|
||||||
|
leaveBoard_title: 'Bord Verlaten',
|
||||||
|
leaveProject_title: 'Project Verlaten',
|
||||||
|
list: 'Lijst',
|
||||||
|
listActions_title: 'Lijstacties',
|
||||||
|
managers: 'Managers',
|
||||||
|
members: 'Leden',
|
||||||
|
minutes: 'Minuten',
|
||||||
|
moveCard_title: 'Kaart Verplaatsen',
|
||||||
|
name: 'Naam',
|
||||||
|
newEmail: 'Nieuwe e-mail',
|
||||||
|
newPassword: 'Nieuw wachtwoord',
|
||||||
|
newUsername: 'Nieuwe gebruikersnaam',
|
||||||
|
noConnectionToServer: 'Geen verbinding met de server',
|
||||||
|
noBoards: 'Geen borden',
|
||||||
|
noLists: 'Geen lijsten',
|
||||||
|
noProjects: 'Geen projecten',
|
||||||
|
notifications: 'Meldingen',
|
||||||
|
noUnreadNotifications: 'Geen ongelezen meldingen',
|
||||||
|
openBoard_title: 'Bord Openen',
|
||||||
|
optional_inline: 'optioneel',
|
||||||
|
organization: 'Organisatie',
|
||||||
|
phone: 'Telefoon',
|
||||||
|
preferences: 'Voorkeuren',
|
||||||
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
|
'Tip: druk op Ctrl-V (Cmd-V op Mac) om een bijlage van het klembord toe te voegen',
|
||||||
|
project: 'Project',
|
||||||
|
projectNotFound_title: 'Project Niet Gevonden',
|
||||||
|
removeManager_title: 'Manager Verwijderen',
|
||||||
|
removeMember_title: 'Lid Verwijderen',
|
||||||
|
searchLabels: 'Zoek labels...',
|
||||||
|
searchMembers: 'Zoek leden...',
|
||||||
|
searchUsers: 'Zoek gebruikers...',
|
||||||
|
seconds: 'Seconden',
|
||||||
|
selectBoard: 'Selecteer bord',
|
||||||
|
selectList: 'Selecteer lijst',
|
||||||
|
selectPermissions_title: 'Selecteer Rechten',
|
||||||
|
selectProject: 'Selecteer project',
|
||||||
|
settings: 'Instellingen',
|
||||||
|
stopwatch: 'Stopwatch',
|
||||||
|
subscribeToMyOwnCardsByDefault: 'Standaard abonneren op mijn eigen kaarten',
|
||||||
|
taskActions_title: 'Taakacties',
|
||||||
|
tasks: 'Taken',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment:
|
||||||
|
'Er is geen voorbeeld beschikbaar voor deze bijlage',
|
||||||
|
time: 'Tijd',
|
||||||
|
title: 'Titel',
|
||||||
|
userActions_title: 'Gebruikersacties',
|
||||||
|
userAddedThisCardToList: '<0>{{user}}</0><1> voegde deze kaart toe aan {{list}}</1>',
|
||||||
|
userLeftNewCommentToCard:
|
||||||
|
'{{user}} liet een nieuwe opmerking achter «{{comment}}» bij <2>{{card}}</2>',
|
||||||
|
userMovedCardFromListToList:
|
||||||
|
'{{user}} verplaatste <2>{{kaart}}</2> van {{fromList}} naar {{toList}}',
|
||||||
|
userMovedThisCardFromListToList:
|
||||||
|
'<0>{{user}}</0><1> verplaatste deze kaart van {{fromList}} naar {{toList}}</1>',
|
||||||
|
username: 'Gebruikersnaam',
|
||||||
|
usernameAlreadyInUse: 'Gebruikersnaam is al in gebruik',
|
||||||
|
users: 'Gebruikers',
|
||||||
|
version: 'Versie',
|
||||||
|
viewer: 'Viewer',
|
||||||
|
writeComment: 'Schrijf een opmerking...',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
addAnotherCard: 'Voeg nog een kaart toe',
|
||||||
|
addAnotherList: 'Voeg nog een lijst toe',
|
||||||
|
addAnotherTask: 'Voeg nog een taak toe',
|
||||||
|
addCard: 'Kaart toevoegen',
|
||||||
|
addCard_title: 'Kaart Toevoegen',
|
||||||
|
addComment: 'Opmerking toevoegen',
|
||||||
|
addList: 'Lijst toevoegen',
|
||||||
|
addMember: 'Lid toevoegen',
|
||||||
|
addMoreDetailedDescription: 'Voeg een meer gedetailleerde beschrijving toe',
|
||||||
|
addTask: 'Taak toevoegen',
|
||||||
|
addToCard: 'Toevoegen aan kaart',
|
||||||
|
addUser: 'Gebruiker toevoegen',
|
||||||
|
createBoard: 'Bord aanmaken',
|
||||||
|
createFile: 'Bestand aanmaken',
|
||||||
|
createLabel: 'Label aanmaken',
|
||||||
|
createNewLabel: 'Nieuw label aanmaken',
|
||||||
|
createProject: 'Project aanmaken',
|
||||||
|
delete: 'Verwijderen',
|
||||||
|
deleteAttachment: 'Bijlage verwijderen',
|
||||||
|
deleteAvatar: 'Avatar verwijderen',
|
||||||
|
deleteBoard: 'Bord verwijderen',
|
||||||
|
deleteCard: 'Kaart verwijderen',
|
||||||
|
deleteCard_title: 'Kaart Verwijderen',
|
||||||
|
deleteComment: 'Opmerking verwijderen',
|
||||||
|
deleteImage: 'Afbeelding verwijderen',
|
||||||
|
deleteLabel: 'Label verwijderen',
|
||||||
|
deleteList: 'Lijst verwijderen',
|
||||||
|
deleteList_title: 'Lijst Verwijderen',
|
||||||
|
deleteProject: 'Project verwijderen',
|
||||||
|
deleteProject_title: 'Project Verwijderen',
|
||||||
|
deleteTask: 'Taak verwijderen',
|
||||||
|
deleteTask_title: 'Taak Verwijderen',
|
||||||
|
deleteUser: 'Gebruiker verwijderen',
|
||||||
|
edit: 'Bewerken',
|
||||||
|
editDueDate_title: 'Vervaldatum Bewerken',
|
||||||
|
editDescription_title: 'Beschrijving Bewerken',
|
||||||
|
editEmail_title: 'E-mail Bewerken',
|
||||||
|
editInformation_title: 'Informatie Bewerken',
|
||||||
|
editPassword_title: 'Wachtwoord Bewerken',
|
||||||
|
editPermissions: 'Rechten Bewerken',
|
||||||
|
editStopwatch_title: 'Stopwatch Bewerken',
|
||||||
|
editTitle_title: 'Titel Bewerken',
|
||||||
|
editUsername_title: 'Gebruikersnaam Bewerken',
|
||||||
|
hideDetails: 'Details verbergen',
|
||||||
|
import: 'Importeren',
|
||||||
|
leaveBoard: 'Bord verlaten',
|
||||||
|
leaveProject: 'Project verlaten',
|
||||||
|
logOut_title: 'Uitloggen',
|
||||||
|
makeCover_title: 'Maak Omslag',
|
||||||
|
move: 'Verplaatsen',
|
||||||
|
moveCard_title: 'Kaart Verplaatsen',
|
||||||
|
remove: 'Verwijderen',
|
||||||
|
removeBackground: 'Achtergrond verwijderen',
|
||||||
|
removeCover_title: 'Omslag Verwijderen',
|
||||||
|
removeFromBoard: 'Verwijderen van bord',
|
||||||
|
removeFromProject: 'Verwijderen van project',
|
||||||
|
removeManager: 'Manager verwijderen',
|
||||||
|
removeMember: 'Lid verwijderen',
|
||||||
|
save: 'Opslaan',
|
||||||
|
showAllAttachments: 'Toon alle bijlagen ({{hidden}} verborgen)',
|
||||||
|
showDetails: 'Details weergeven',
|
||||||
|
showFewerAttachments: 'Toon minder bijlagen',
|
||||||
|
start: 'Start',
|
||||||
|
stop: 'Stop',
|
||||||
|
subscribe: 'Abonneren',
|
||||||
|
unsubscribe: 'Afmelden',
|
||||||
|
uploadNewAvatar: 'Nieuwe avatar uploaden',
|
||||||
|
uploadNewImage: 'Nieuwe afbeelding uploaden',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import merge from 'lodash/merge';
|
||||||
|
|
||||||
|
import login from './login';
|
||||||
|
import core from './core';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
language: 'nl',
|
||||||
|
country: 'nl',
|
||||||
|
name: 'Dutch',
|
||||||
|
embeddedLocale: merge(login, core),
|
||||||
|
};
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
export default {
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
emailOrUsername: 'E-mail of gebruikersnaam',
|
||||||
|
invalidEmailOrUsername: 'Ongeldige e-mail of gebruikersnaam',
|
||||||
|
invalidPassword: 'Ongeldig wachtwoord',
|
||||||
|
logInToPlanka: 'Inloggen op Planka',
|
||||||
|
noInternetConnection: 'Geen internetverbinding',
|
||||||
|
pageNotFound_title: 'Pagina Niet Gevonden',
|
||||||
|
password: 'Wachtwoord',
|
||||||
|
projectManagement: 'Projectbeheer',
|
||||||
|
serverConnectionFailed: 'Verbinding met server mislukt',
|
||||||
|
unknownError: 'Onbekende fout, probeer het later opnieuw',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
logIn: 'Inloggen',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -43,14 +43,16 @@ export default class extends BaseModel {
|
|||||||
organization: attr(),
|
organization: attr(),
|
||||||
language: attr(),
|
language: attr(),
|
||||||
subscribeToOwnCards: attr(),
|
subscribeToOwnCards: attr(),
|
||||||
isAdmin: attr(),
|
|
||||||
isLocked: attr(),
|
|
||||||
isRoleLocked: attr(),
|
|
||||||
isDeletionLocked: attr(),
|
|
||||||
deletedAt: attr(),
|
|
||||||
createdAt: attr({
|
createdAt: attr({
|
||||||
getDefault: () => new Date(),
|
getDefault: () => new Date(),
|
||||||
}),
|
}),
|
||||||
|
deletedAt: attr(),
|
||||||
|
isAdmin: attr({
|
||||||
|
getDefault: () => false,
|
||||||
|
}),
|
||||||
|
isLocked: attr({
|
||||||
|
getDefault: () => false,
|
||||||
|
}),
|
||||||
isAvatarUpdating: attr({
|
isAvatarUpdating: attr({
|
||||||
getDefault: () => false,
|
getDefault: () => false,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ const initialState = {
|
|||||||
export default (state = initialState, { type, payload }) => {
|
export default (state = initialState, { type, payload }) => {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case ActionTypes.AUTHENTICATE__SUCCESS:
|
case ActionTypes.AUTHENTICATE__SUCCESS:
|
||||||
case ActionTypes.USING_OIDC_AUTHENTICATE__SUCCESS:
|
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
accessToken: payload.accessToken,
|
accessToken: payload.accessToken,
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import ActionTypes from '../constants/ActionTypes';
|
|||||||
import ModalTypes from '../constants/ModalTypes';
|
import ModalTypes from '../constants/ModalTypes';
|
||||||
|
|
||||||
const initialState = {
|
const initialState = {
|
||||||
|
isInitializing: true,
|
||||||
isLogouting: false,
|
isLogouting: false,
|
||||||
currentModal: null,
|
currentModal: null,
|
||||||
};
|
};
|
||||||
@@ -17,6 +18,11 @@ export default (state = initialState, { type, payload }) => {
|
|||||||
...state,
|
...state,
|
||||||
currentModal: null,
|
currentModal: null,
|
||||||
};
|
};
|
||||||
|
case ActionTypes.CORE_INITIALIZE:
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
isInitializing: false,
|
||||||
|
};
|
||||||
case ActionTypes.LOGOUT__ACCESS_TOKEN_INVALIDATE:
|
case ActionTypes.LOGOUT__ACCESS_TOKEN_INVALIDATE:
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { combineReducers } from 'redux';
|
|||||||
import router from './router';
|
import router from './router';
|
||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
import orm from './orm';
|
import orm from './orm';
|
||||||
import root from './root';
|
|
||||||
import auth from './auth';
|
import auth from './auth';
|
||||||
import core from './core';
|
import core from './core';
|
||||||
import ui from './ui';
|
import ui from './ui';
|
||||||
@@ -12,7 +11,6 @@ export default combineReducers({
|
|||||||
router,
|
router,
|
||||||
socket,
|
socket,
|
||||||
orm,
|
orm,
|
||||||
root,
|
|
||||||
auth,
|
auth,
|
||||||
core,
|
core,
|
||||||
ui,
|
ui,
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
import ActionTypes from '../constants/ActionTypes';
|
|
||||||
|
|
||||||
const initialState = {
|
|
||||||
isInitializing: true,
|
|
||||||
config: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
// eslint-disable-next-line default-param-last
|
|
||||||
export default (state = initialState, { type, payload }) => {
|
|
||||||
switch (type) {
|
|
||||||
case ActionTypes.LOGIN_INITIALIZE:
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
isInitializing: false,
|
|
||||||
config: payload.config,
|
|
||||||
};
|
|
||||||
case ActionTypes.AUTHENTICATE__SUCCESS:
|
|
||||||
case ActionTypes.USING_OIDC_AUTHENTICATE__SUCCESS:
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
isInitializing: true,
|
|
||||||
};
|
|
||||||
case ActionTypes.CORE_INITIALIZE:
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
isInitializing: false,
|
|
||||||
};
|
|
||||||
case ActionTypes.CORE_INITIALIZE__CONFIG_FETCH:
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
config: payload.config,
|
|
||||||
};
|
|
||||||
default:
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
import { LOCATION_CHANGE_HANDLE } from '../../lib/redux-router';
|
|
||||||
|
|
||||||
import ActionTypes from '../../constants/ActionTypes';
|
import ActionTypes from '../../constants/ActionTypes';
|
||||||
import Paths from '../../constants/Paths';
|
|
||||||
|
|
||||||
const initialState = {
|
const initialState = {
|
||||||
data: {
|
data: {
|
||||||
@@ -9,22 +6,12 @@ const initialState = {
|
|||||||
password: '',
|
password: '',
|
||||||
},
|
},
|
||||||
isSubmitting: false,
|
isSubmitting: false,
|
||||||
isSubmittingUsingOidc: false,
|
|
||||||
error: null,
|
error: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
// eslint-disable-next-line default-param-last
|
// eslint-disable-next-line default-param-last
|
||||||
export default (state = initialState, { type, payload }) => {
|
export default (state = initialState, { type, payload }) => {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case LOCATION_CHANGE_HANDLE:
|
|
||||||
if (payload.location.pathname === Paths.OIDC_CALLBACK) {
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
isSubmittingUsingOidc: true,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return state;
|
|
||||||
case ActionTypes.AUTHENTICATE:
|
case ActionTypes.AUTHENTICATE:
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
@@ -35,7 +22,6 @@ export default (state = initialState, { type, payload }) => {
|
|||||||
isSubmitting: true,
|
isSubmitting: true,
|
||||||
};
|
};
|
||||||
case ActionTypes.AUTHENTICATE__SUCCESS:
|
case ActionTypes.AUTHENTICATE__SUCCESS:
|
||||||
case ActionTypes.USING_OIDC_AUTHENTICATE__SUCCESS:
|
|
||||||
return initialState;
|
return initialState;
|
||||||
case ActionTypes.AUTHENTICATE__FAILURE:
|
case ActionTypes.AUTHENTICATE__FAILURE:
|
||||||
return {
|
return {
|
||||||
@@ -43,12 +29,6 @@ export default (state = initialState, { type, payload }) => {
|
|||||||
isSubmitting: false,
|
isSubmitting: false,
|
||||||
error: payload.error,
|
error: payload.error,
|
||||||
};
|
};
|
||||||
case ActionTypes.USING_OIDC_AUTHENTICATE__FAILURE:
|
|
||||||
return {
|
|
||||||
...state,
|
|
||||||
isSubmittingUsingOidc: false,
|
|
||||||
error: payload.error,
|
|
||||||
};
|
|
||||||
case ActionTypes.AUTHENTICATE_ERROR_CLEAR:
|
case ActionTypes.AUTHENTICATE_ERROR_CLEAR:
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import { all, apply, fork, select, take } from 'redux-saga/effects';
|
import { all, apply, fork, take } from 'redux-saga/effects';
|
||||||
|
|
||||||
import watchers from './watchers';
|
import watchers from './watchers';
|
||||||
import services from './services';
|
import services from './services';
|
||||||
import selectors from '../../selectors';
|
|
||||||
import { socket } from '../../api';
|
import { socket } from '../../api';
|
||||||
import ActionTypes from '../../constants/ActionTypes';
|
import ActionTypes from '../../constants/ActionTypes';
|
||||||
import Paths from '../../constants/Paths';
|
import Paths from '../../constants/Paths';
|
||||||
@@ -15,12 +14,5 @@ export default function* coreSaga() {
|
|||||||
|
|
||||||
yield take(ActionTypes.LOGOUT);
|
yield take(ActionTypes.LOGOUT);
|
||||||
|
|
||||||
const oidcConfig = yield select(selectors.selectOidcConfig);
|
window.location.href = Paths.LOGIN;
|
||||||
|
|
||||||
if (oidcConfig && oidcConfig.endSessionUrl !== null) {
|
|
||||||
// Redirect the user to the IDP to log out.
|
|
||||||
window.location.href = oidcConfig.endSessionUrl;
|
|
||||||
} else {
|
|
||||||
window.location.href = Paths.LOGIN;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,13 @@
|
|||||||
import { call, put, select, take } from 'redux-saga/effects';
|
import { call, put, take } from 'redux-saga/effects';
|
||||||
|
|
||||||
import request from '../request';
|
import request from '../request';
|
||||||
import requests from '../requests';
|
import requests from '../requests';
|
||||||
import selectors from '../../../selectors';
|
|
||||||
import actions from '../../../actions';
|
import actions from '../../../actions';
|
||||||
import api from '../../../api';
|
import api from '../../../api';
|
||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
import { removeAccessToken } from '../../../utils/access-token-storage';
|
import { removeAccessToken } from '../../../utils/access-token-storage';
|
||||||
|
|
||||||
export function* initializeCore() {
|
export function* initializeCore() {
|
||||||
const currentConfig = yield select(selectors.selectConfig); // TODO: add boolean selector?
|
|
||||||
|
|
||||||
let config;
|
|
||||||
if (!currentConfig) {
|
|
||||||
({ item: config } = yield call(api.getConfig)); // TODO: handle error
|
|
||||||
|
|
||||||
yield put(actions.initializeCore.fetchConfig(config));
|
|
||||||
}
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
user,
|
user,
|
||||||
board,
|
board,
|
||||||
|
|||||||
@@ -33,16 +33,15 @@ export function* handleLocationChange() {
|
|||||||
|
|
||||||
switch (pathsMatch.pattern.path) {
|
switch (pathsMatch.pattern.path) {
|
||||||
case Paths.LOGIN:
|
case Paths.LOGIN:
|
||||||
case Paths.OIDC_CALLBACK:
|
|
||||||
yield call(goToRoot);
|
yield call(goToRoot);
|
||||||
|
|
||||||
return;
|
break;
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
const isInitializing = yield select(selectors.selectIsInitializing);
|
const isCoreInitializing = yield select(selectors.selectIsCoreInitializing);
|
||||||
|
|
||||||
if (isInitializing) {
|
if (isCoreInitializing) {
|
||||||
yield take(ActionTypes.CORE_INITIALIZE);
|
yield take(ActionTypes.CORE_INITIALIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,5 +4,8 @@ import services from '../services';
|
|||||||
import EntryActionTypes from '../../../constants/EntryActionTypes';
|
import EntryActionTypes from '../../../constants/EntryActionTypes';
|
||||||
|
|
||||||
export default function* coreWatchers() {
|
export default function* coreWatchers() {
|
||||||
yield all([takeEvery(EntryActionTypes.LOGOUT, () => services.logout())]);
|
yield all([
|
||||||
|
takeEvery(EntryActionTypes.CORE_INITIALIZE, () => services.initializeCore()),
|
||||||
|
takeEvery(EntryActionTypes.LOGOUT, () => services.logout()),
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ import ActionTypes from '../../constants/ActionTypes';
|
|||||||
export default function* loginSaga() {
|
export default function* loginSaga() {
|
||||||
const watcherTasks = yield all(watchers.map((watcher) => fork(watcher)));
|
const watcherTasks = yield all(watchers.map((watcher) => fork(watcher)));
|
||||||
|
|
||||||
yield fork(services.initializeLogin);
|
yield take(ActionTypes.AUTHENTICATE__SUCCESS);
|
||||||
|
|
||||||
yield take([ActionTypes.AUTHENTICATE__SUCCESS, ActionTypes.USING_OIDC_AUTHENTICATE__SUCCESS]);
|
|
||||||
|
|
||||||
yield cancel(watcherTasks);
|
yield cancel(watcherTasks);
|
||||||
yield call(services.goToRoot);
|
yield call(services.goToRoot);
|
||||||
|
|||||||
@@ -1,25 +1,19 @@
|
|||||||
import { nanoid } from 'nanoid';
|
import { call, put } from 'redux-saga/effects';
|
||||||
import { call, put, select } from 'redux-saga/effects';
|
|
||||||
import { replace } from '../../../lib/redux-router';
|
|
||||||
|
|
||||||
import selectors from '../../../selectors';
|
|
||||||
import actions from '../../../actions';
|
import actions from '../../../actions';
|
||||||
import api from '../../../api';
|
import api from '../../../api';
|
||||||
import { setAccessToken } from '../../../utils/access-token-storage';
|
import { setAccessToken } from '../../../utils/access-token-storage';
|
||||||
import Paths from '../../../constants/Paths';
|
|
||||||
|
|
||||||
export function* initializeLogin() {
|
|
||||||
const { item: config } = yield call(api.getConfig); // TODO: handle error
|
|
||||||
|
|
||||||
yield put(actions.initializeLogin(config));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function* authenticate(data) {
|
export function* authenticate(data) {
|
||||||
yield put(actions.authenticate(data));
|
yield put(actions.authenticate(data));
|
||||||
|
|
||||||
let accessToken;
|
let accessToken = data.access_token;
|
||||||
try {
|
try {
|
||||||
({ item: accessToken } = yield call(api.createAccessToken, data));
|
if (accessToken) {
|
||||||
|
({ item: accessToken } = yield call(api.exchangeOidcToken, accessToken));
|
||||||
|
} else {
|
||||||
|
({ item: accessToken } = yield call(api.createAccessToken, data));
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
yield put(actions.authenticate.failure(error));
|
yield put(actions.authenticate.failure(error));
|
||||||
return;
|
return;
|
||||||
@@ -29,76 +23,11 @@ export function* authenticate(data) {
|
|||||||
yield put(actions.authenticate.success(accessToken));
|
yield put(actions.authenticate.success(accessToken));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function* authenticateUsingOidc() {
|
|
||||||
const oidcConfig = yield select(selectors.selectOidcConfig);
|
|
||||||
|
|
||||||
const nonce = nanoid();
|
|
||||||
window.sessionStorage.setItem('oidc-nonce', nonce);
|
|
||||||
window.location.href = `${oidcConfig.authorizationUrl}&nonce=${encodeURIComponent(nonce)}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function* authenticateUsingOidcCallback() {
|
|
||||||
// https://github.com/plankanban/planka/issues/511#issuecomment-1771385639
|
|
||||||
const params = new URLSearchParams(window.location.hash.substring(1) || window.location.search);
|
|
||||||
|
|
||||||
yield put(replace(Paths.LOGIN));
|
|
||||||
|
|
||||||
if (params.get('error') !== null) {
|
|
||||||
yield put(
|
|
||||||
actions.authenticateUsingOidc.failure(
|
|
||||||
new Error(
|
|
||||||
`OIDC Authorization error: ${params.get('error')}: ${params.get('error_description')}`,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const nonce = window.sessionStorage.getItem('oidc-nonce');
|
|
||||||
if (nonce === null) {
|
|
||||||
yield put(
|
|
||||||
actions.authenticateUsingOidc.failure(
|
|
||||||
new Error('Unable to process OIDC response: no nonce issued'),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const code = params.get('code');
|
|
||||||
if (code === null) {
|
|
||||||
yield put(
|
|
||||||
actions.authenticateUsingOidc.failure(new Error('Invalid OIDC response: no code parameter')),
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
window.sessionStorage.removeItem('oidc-nonce');
|
|
||||||
|
|
||||||
if (code !== null) {
|
|
||||||
let accessToken;
|
|
||||||
try {
|
|
||||||
({ item: accessToken } = yield call(api.exchangeForAccessTokenUsingOidc, {
|
|
||||||
code,
|
|
||||||
nonce,
|
|
||||||
}));
|
|
||||||
} catch (error) {
|
|
||||||
yield put(actions.authenticateUsingOidc.failure(error));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
yield call(setAccessToken, accessToken);
|
|
||||||
yield put(actions.authenticateUsingOidc.success(accessToken));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function* clearAuthenticateError() {
|
export function* clearAuthenticateError() {
|
||||||
yield put(actions.clearAuthenticateError());
|
yield put(actions.clearAuthenticateError());
|
||||||
}
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
initializeLogin,
|
|
||||||
authenticate,
|
authenticate,
|
||||||
authenticateUsingOidc,
|
|
||||||
authenticateUsingOidcCallback,
|
|
||||||
clearAuthenticateError,
|
clearAuthenticateError,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import { call, put, select, take } from 'redux-saga/effects';
|
import { call, put, select } from 'redux-saga/effects';
|
||||||
import { push } from '../../../lib/redux-router';
|
import { push } from '../../../lib/redux-router';
|
||||||
|
|
||||||
import { authenticateUsingOidcCallback } from './login';
|
|
||||||
import selectors from '../../../selectors';
|
import selectors from '../../../selectors';
|
||||||
import ActionTypes from '../../../constants/ActionTypes';
|
|
||||||
import Paths from '../../../constants/Paths';
|
import Paths from '../../../constants/Paths';
|
||||||
|
|
||||||
export function* goToLogin() {
|
export function* goToLogin() {
|
||||||
@@ -29,17 +27,6 @@ export function* handleLocationChange() {
|
|||||||
yield call(goToLogin);
|
yield call(goToLogin);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case Paths.OIDC_CALLBACK: {
|
|
||||||
const isInitializing = yield select(selectors.selectIsInitializing);
|
|
||||||
|
|
||||||
if (isInitializing) {
|
|
||||||
yield take(ActionTypes.LOGIN_INITIALIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
yield call(authenticateUsingOidcCallback);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ export default function* loginWatchers() {
|
|||||||
takeEvery(EntryActionTypes.AUTHENTICATE, ({ payload: { data } }) =>
|
takeEvery(EntryActionTypes.AUTHENTICATE, ({ payload: { data } }) =>
|
||||||
services.authenticate(data),
|
services.authenticate(data),
|
||||||
),
|
),
|
||||||
takeEvery(EntryActionTypes.USING_OIDC_AUTHENTICATE, () => services.authenticateUsingOidc()),
|
|
||||||
takeEvery(EntryActionTypes.AUTHENTICATE_ERROR_CLEAR, () => services.clearAuthenticateError()),
|
takeEvery(EntryActionTypes.AUTHENTICATE_ERROR_CLEAR, () => services.clearAuthenticateError()),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import Config from '../constants/Config';
|
|||||||
|
|
||||||
export const selectAccessToken = ({ auth: { accessToken } }) => accessToken;
|
export const selectAccessToken = ({ auth: { accessToken } }) => accessToken;
|
||||||
|
|
||||||
|
export const selectIsCoreInitializing = ({ core: { isInitializing } }) => isInitializing;
|
||||||
|
|
||||||
export const selectIsLogouting = ({ core: { isLogouting } }) => isLogouting;
|
export const selectIsLogouting = ({ core: { isLogouting } }) => isLogouting;
|
||||||
|
|
||||||
const nextPosition = (items, index, excludedId) => {
|
const nextPosition = (items, index, excludedId) => {
|
||||||
@@ -113,6 +115,7 @@ export const selectNextTaskPosition = createSelector(
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
selectAccessToken,
|
selectAccessToken,
|
||||||
|
selectIsCoreInitializing,
|
||||||
selectIsLogouting,
|
selectIsLogouting,
|
||||||
selectNextBoardPosition,
|
selectNextBoardPosition,
|
||||||
selectNextLabelPosition,
|
selectNextLabelPosition,
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import router from './router';
|
import router from './router';
|
||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
import root from './root';
|
|
||||||
import core from './core';
|
import core from './core';
|
||||||
import modals from './modals';
|
import modals from './modals';
|
||||||
import users from './users';
|
import users from './users';
|
||||||
@@ -17,7 +16,6 @@ import attachments from './attachments';
|
|||||||
export default {
|
export default {
|
||||||
...router,
|
...router,
|
||||||
...socket,
|
...socket,
|
||||||
...root,
|
|
||||||
...core,
|
...core,
|
||||||
...modals,
|
...modals,
|
||||||
...users,
|
...users,
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
export const selectIsInitializing = ({ root: { isInitializing } }) => isInitializing;
|
|
||||||
|
|
||||||
export const selectConfig = ({ root: { config } }) => config;
|
|
||||||
|
|
||||||
export const selectOidcConfig = (state) => selectConfig(state).oidc;
|
|
||||||
|
|
||||||
export default {
|
|
||||||
selectIsInitializing,
|
|
||||||
selectConfig,
|
|
||||||
selectOidcConfig,
|
|
||||||
};
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import Cookies from 'js-cookie';
|
import Cookies from 'js-cookie';
|
||||||
import { jwtDecode } from 'jwt-decode';
|
import jwtDecode from 'jwt-decode';
|
||||||
|
|
||||||
import Config from '../constants/Config';
|
import Config from '../constants/Config';
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
version: '3'
|
|
||||||
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- db-data:/var/lib/postgresql/data
|
|
||||||
ports:
|
|
||||||
- 5432:5432
|
|
||||||
environment:
|
|
||||||
- POSTGRES_DB=planka
|
|
||||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
db-data:
|
|
||||||
+3
-52
@@ -1,65 +1,16 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
planka:
|
|
||||||
image: ghcr.io/plankanban/planka:dev
|
|
||||||
command: >
|
|
||||||
bash -c
|
|
||||||
"for i in `seq 1 30`; do
|
|
||||||
./start.sh &&
|
|
||||||
s=$$? && break || s=$$?;
|
|
||||||
echo \"Tried $$i times. Waiting 5 seconds...\";
|
|
||||||
sleep 5;
|
|
||||||
done; (exit $$s)"
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- user-avatars:/app/public/user-avatars
|
|
||||||
- project-background-images:/app/public/project-background-images
|
|
||||||
- attachments:/app/private/attachments
|
|
||||||
ports:
|
|
||||||
- 3000:1337
|
|
||||||
environment:
|
|
||||||
- BASE_URL=http://localhost:3000
|
|
||||||
- DATABASE_URL=postgresql://postgres@postgres/planka
|
|
||||||
- SECRET_KEY=notsecretkey
|
|
||||||
|
|
||||||
# - 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
|
|
||||||
|
|
||||||
# - DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted
|
|
||||||
# - DEFAULT_ADMIN_PASSWORD=demo
|
|
||||||
# - DEFAULT_ADMIN_NAME=Demo Demo
|
|
||||||
# - DEFAULT_ADMIN_USERNAME=demo
|
|
||||||
|
|
||||||
# - OIDC_ISSUER=
|
|
||||||
# - OIDC_CLIENT_ID=
|
|
||||||
# - OIDC_CLIENT_SECRET=
|
|
||||||
# - OIDC_SCOPES=openid email profile
|
|
||||||
# - OIDC_ADMIN_ROLES=admin
|
|
||||||
# - OIDC_ROLES_ATTRIBUTE=groups
|
|
||||||
# - OIDC_IGNORE_ROLES=true
|
|
||||||
depends_on:
|
|
||||||
- postgres
|
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:14-alpine
|
image: postgres:alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/var/lib/postgresql/data
|
- db-data:/var/lib/postgresql/data
|
||||||
|
ports:
|
||||||
|
- 5432:5432
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_DB=planka
|
- POSTGRES_DB=planka
|
||||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
- POSTGRES_HOST_AUTH_METHOD=trust
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
user-avatars:
|
|
||||||
project-background-images:
|
|
||||||
attachments:
|
|
||||||
db-data:
|
db-data:
|
||||||
|
|||||||
+6
-15
@@ -20,11 +20,15 @@ services:
|
|||||||
- 3000:1337
|
- 3000:1337
|
||||||
environment:
|
environment:
|
||||||
- BASE_URL=http://localhost:3000
|
- BASE_URL=http://localhost:3000
|
||||||
|
- TRUST_PROXY=0
|
||||||
- DATABASE_URL=postgresql://postgres@postgres/planka
|
- DATABASE_URL=postgresql://postgres@postgres/planka
|
||||||
- SECRET_KEY=notsecretkey
|
- SECRET_KEY=notsecretkey
|
||||||
|
|
||||||
# - TRUST_PROXY=0
|
# Can be removed after installation
|
||||||
# - TOKEN_EXPIRES_IN=365 # In days
|
- DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted
|
||||||
|
- DEFAULT_ADMIN_PASSWORD=demo
|
||||||
|
- DEFAULT_ADMIN_NAME=Demo Demo
|
||||||
|
- DEFAULT_ADMIN_USERNAME=demo
|
||||||
|
|
||||||
# related: https://github.com/knex/knex/issues/2354
|
# related: https://github.com/knex/knex/issues/2354
|
||||||
# As knex does not pass query parameters from the connection string we
|
# As knex does not pass query parameters from the connection string we
|
||||||
@@ -33,19 +37,6 @@ services:
|
|||||||
|
|
||||||
# Configure knex to accept SSL certificates
|
# Configure knex to accept SSL certificates
|
||||||
# - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
|
# - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
|
||||||
|
|
||||||
# - DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted
|
|
||||||
# - DEFAULT_ADMIN_PASSWORD=demo
|
|
||||||
# - DEFAULT_ADMIN_NAME=Demo Demo
|
|
||||||
# - DEFAULT_ADMIN_USERNAME=demo
|
|
||||||
|
|
||||||
# - OIDC_ISSUER=
|
|
||||||
# - OIDC_CLIENT_ID=
|
|
||||||
# - OIDC_CLIENT_SECRET=
|
|
||||||
# - OIDC_SCOPES=openid email profile
|
|
||||||
# - OIDC_ADMIN_ROLES=admin
|
|
||||||
# - OIDC_ROLES_ATTRIBUTE=groups
|
|
||||||
# - OIDC_IGNORE_ROLES=true
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres
|
- postgres
|
||||||
|
|
||||||
|
|||||||
Generated
+827
-1384
File diff suppressed because it is too large
Load Diff
+8
-8
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.15.0",
|
"version": "1.12.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": "https://plankanban.github.io/planka",
|
"homepage": "https://plankanban.github.io/planka",
|
||||||
"repository": {
|
"repository": {
|
||||||
@@ -56,14 +56,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"concurrently": "^8.2.2",
|
"concurrently": "^7.6.0",
|
||||||
"husky": "^8.0.3",
|
"husky": "^8.0.2",
|
||||||
"lint-staged": "^15.1.0"
|
"lint-staged": "^13.0.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"eslint": "^8.53.0",
|
"eslint": "^8.28.0",
|
||||||
"eslint-config-prettier": "^9.0.0",
|
"eslint-config-prettier": "^8.5.0",
|
||||||
"eslint-plugin-prettier": "^5.0.1",
|
"eslint-plugin-prettier": "^4.2.1",
|
||||||
"prettier": "^3.1.0"
|
"prettier": "^2.7.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-13
@@ -4,6 +4,13 @@ BASE_URL=http://localhost:1337
|
|||||||
DATABASE_URL=postgresql://postgres@localhost/planka
|
DATABASE_URL=postgresql://postgres@localhost/planka
|
||||||
SECRET_KEY=notsecretkey
|
SECRET_KEY=notsecretkey
|
||||||
|
|
||||||
|
## Can be removed after installation
|
||||||
|
|
||||||
|
DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted
|
||||||
|
DEFAULT_ADMIN_PASSWORD=demo
|
||||||
|
DEFAULT_ADMIN_NAME=Demo Demo
|
||||||
|
DEFAULT_ADMIN_USERNAME=demo
|
||||||
|
|
||||||
## Optional
|
## Optional
|
||||||
|
|
||||||
# TRUST_PROXY=0
|
# TRUST_PROXY=0
|
||||||
@@ -17,19 +24,6 @@ SECRET_KEY=notsecretkey
|
|||||||
# Configure knex to accept SSL certificates
|
# Configure knex to accept SSL certificates
|
||||||
# KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
|
# KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
|
||||||
|
|
||||||
# DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted
|
|
||||||
# DEFAULT_ADMIN_PASSWORD=demo
|
|
||||||
# DEFAULT_ADMIN_NAME=Demo Demo
|
|
||||||
# DEFAULT_ADMIN_USERNAME=demo
|
|
||||||
|
|
||||||
# OIDC_ISSUER=
|
|
||||||
# OIDC_CLIENT_ID=
|
|
||||||
# OIDC_CLIENT_SECRET=
|
|
||||||
# OIDC_SCOPES=openid email profile
|
|
||||||
# OIDC_ADMIN_ROLES=admin
|
|
||||||
# OIDC_ROLES_ATTRIBUTE=groups
|
|
||||||
# OIDC_IGNORE_ROLES=true
|
|
||||||
|
|
||||||
## Do not edit this
|
## Do not edit this
|
||||||
|
|
||||||
TZ=UTC
|
TZ=UTC
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ const Errors = {
|
|||||||
INVALID_PASSWORD: {
|
INVALID_PASSWORD: {
|
||||||
invalidPassword: 'Invalid password',
|
invalidPassword: 'Invalid password',
|
||||||
},
|
},
|
||||||
USE_SINGLE_SIGN_ON: {
|
|
||||||
useSingleSignOn: 'Use single sign-on',
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const emailOrUsernameValidator = (value) =>
|
const emailOrUsernameValidator = (value) =>
|
||||||
@@ -40,9 +37,6 @@ module.exports = {
|
|||||||
invalidPassword: {
|
invalidPassword: {
|
||||||
responseType: 'unauthorized',
|
responseType: 'unauthorized',
|
||||||
},
|
},
|
||||||
useSingleSignOn: {
|
|
||||||
responseType: 'forbidden',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
async fn(inputs) {
|
async fn(inputs) {
|
||||||
@@ -57,10 +51,6 @@ module.exports = {
|
|||||||
throw Errors.INVALID_EMAIL_OR_USERNAME;
|
throw Errors.INVALID_EMAIL_OR_USERNAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.isSso) {
|
|
||||||
throw Errors.USE_SINGLE_SIGN_ON;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!bcrypt.compareSync(inputs.password, user.password)) {
|
if (!bcrypt.compareSync(inputs.password, user.password)) {
|
||||||
sails.log.warn(`Invalid password! (IP: ${remoteAddress})`);
|
sails.log.warn(`Invalid password! (IP: ${remoteAddress})`);
|
||||||
throw Errors.INVALID_PASSWORD;
|
throw Errors.INVALID_PASSWORD;
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
const { getRemoteAddress } = require('../../../utils/remoteAddress');
|
|
||||||
|
|
||||||
const Errors = {
|
|
||||||
INVALID_CODE_OR_NONCE: {
|
|
||||||
invalidCodeOrNonce: 'Invalid code or nonce',
|
|
||||||
},
|
|
||||||
EMAIL_ALREADY_IN_USE: {
|
|
||||||
emailAlreadyInUse: 'Email already in use',
|
|
||||||
},
|
|
||||||
USERNAME_ALREADY_IN_USE: {
|
|
||||||
usernameAlreadyInUse: 'Username already in use',
|
|
||||||
},
|
|
||||||
MISSING_VALUES: {
|
|
||||||
missingValues: 'Unable to retrieve required values (email, name)',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
inputs: {
|
|
||||||
code: {
|
|
||||||
type: 'string',
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
nonce: {
|
|
||||||
type: 'string',
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
exits: {
|
|
||||||
invalidCodeOrNonce: {
|
|
||||||
responseType: 'unauthorized',
|
|
||||||
},
|
|
||||||
emailAlreadyInUse: {
|
|
||||||
responseType: 'conflict',
|
|
||||||
},
|
|
||||||
usernameAlreadyInUse: {
|
|
||||||
responseType: 'conflict',
|
|
||||||
},
|
|
||||||
missingValues: {
|
|
||||||
responseType: 'unprocessableEntity',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
async fn(inputs) {
|
|
||||||
const remoteAddress = getRemoteAddress(this.req);
|
|
||||||
|
|
||||||
const user = await sails.helpers.users
|
|
||||||
.getOrCreateOneUsingOidc(inputs.code, inputs.nonce)
|
|
||||||
.intercept('invalidCodeOrNonce', () => {
|
|
||||||
sails.log.warn(`Invalid code or nonce! (IP: ${remoteAddress})`);
|
|
||||||
return Errors.INVALID_CODE_OR_NONCE;
|
|
||||||
})
|
|
||||||
.intercept('emailAlreadyInUse', () => Errors.EMAIL_ALREADY_IN_USE)
|
|
||||||
.intercept('usernameAlreadyInUse', () => Errors.USERNAME_ALREADY_IN_USE)
|
|
||||||
.intercept('missingValues', () => Errors.MISSING_VALUES);
|
|
||||||
|
|
||||||
const accessToken = sails.helpers.utils.createToken(user.id);
|
|
||||||
|
|
||||||
await Session.create({
|
|
||||||
accessToken,
|
|
||||||
remoteAddress,
|
|
||||||
userId: user.id,
|
|
||||||
userAgent: this.req.headers['user-agent'],
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
item: accessToken,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
const jwt = require('jsonwebtoken');
|
||||||
|
const jwksClient = require('jwks-rsa');
|
||||||
|
const openidClient = require('openid-client');
|
||||||
|
const { getRemoteAddress } = require('../../../utils/remoteAddress');
|
||||||
|
|
||||||
|
const Errors = {
|
||||||
|
INVALID_TOKEN: {
|
||||||
|
invalidToken: 'Access Token is invalid',
|
||||||
|
},
|
||||||
|
MISSING_VALUES: {
|
||||||
|
missingValues:
|
||||||
|
'Unable to retrieve required values. Verify the access token or UserInfo endpoint has email, username and name claims',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const jwks = jwksClient({
|
||||||
|
jwksUri: sails.config.custom.oidcJwksUri,
|
||||||
|
requestHeaders: {}, // Optional
|
||||||
|
timeout: 30000, // Defaults to 30s
|
||||||
|
});
|
||||||
|
|
||||||
|
const getJwtVerificationOptions = () => {
|
||||||
|
const options = {};
|
||||||
|
if (sails.config.custom.oidcIssuer) {
|
||||||
|
options.issuer = sails.config.custom.oidcIssuer;
|
||||||
|
}
|
||||||
|
if (sails.config.custom.oidcAudience) {
|
||||||
|
options.audience = sails.config.custom.oidcAudience;
|
||||||
|
}
|
||||||
|
return options;
|
||||||
|
};
|
||||||
|
|
||||||
|
const validateAndDecodeToken = async (accessToken, options) => {
|
||||||
|
const keys = await jwks.getSigningKeys();
|
||||||
|
let validToken = {};
|
||||||
|
|
||||||
|
const isTokenValid = keys.some((signingKey) => {
|
||||||
|
try {
|
||||||
|
const key = signingKey.getPublicKey();
|
||||||
|
validToken = jwt.verify(accessToken, key, options);
|
||||||
|
return 'true';
|
||||||
|
} catch (error) {
|
||||||
|
sails.log.error(error);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!isTokenValid) {
|
||||||
|
const tokenForLogging = jwt.decode(accessToken);
|
||||||
|
const remoteAddress = getRemoteAddress(this.req);
|
||||||
|
|
||||||
|
sails.log.warn(
|
||||||
|
`invalid token: sub: "${tokenForLogging.sub}" issuer: "${tokenForLogging.iss}" audience: "${tokenForLogging.aud}" exp: ${tokenForLogging.exp} (IP: ${remoteAddress})`,
|
||||||
|
);
|
||||||
|
throw Errors.INVALID_TOKEN;
|
||||||
|
}
|
||||||
|
return validToken;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getUserInfo = async (accessToken, options) => {
|
||||||
|
if (sails.config.custom.oidcSkipUserInfo) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
const issuer = await openidClient.Issuer.discover(options.issuer);
|
||||||
|
const oidcClient = new issuer.Client({
|
||||||
|
client_id: 'irrelevant',
|
||||||
|
});
|
||||||
|
const userInfo = await oidcClient.userinfo(accessToken);
|
||||||
|
return userInfo;
|
||||||
|
};
|
||||||
|
const mergeUserData = (validToken, userInfo) => {
|
||||||
|
const oidcUser = { ...validToken, ...userInfo };
|
||||||
|
return oidcUser;
|
||||||
|
};
|
||||||
|
const getOrCreateUser = async (newUser) => {
|
||||||
|
const user = await User.findOne({
|
||||||
|
where: {
|
||||||
|
username: newUser.username,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (user) {
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
return User.create(newUser).fetch();
|
||||||
|
};
|
||||||
|
module.exports = {
|
||||||
|
inputs: {
|
||||||
|
token: {
|
||||||
|
type: 'string',
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
exits: {
|
||||||
|
invalidToken: {
|
||||||
|
responseType: 'unauthorized',
|
||||||
|
},
|
||||||
|
missingValues: {
|
||||||
|
responseType: 'unauthorized',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fn(inputs) {
|
||||||
|
const options = getJwtVerificationOptions();
|
||||||
|
const validToken = await validateAndDecodeToken(inputs.token, options);
|
||||||
|
const userInfo = await getUserInfo(inputs.token, options);
|
||||||
|
const oidcUser = mergeUserData(validToken, userInfo);
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
let isAdmin = false;
|
||||||
|
if (sails.config.custom.oidcAdminRoles.includes('*')) isAdmin = true;
|
||||||
|
else if (Array.isArray(oidcUser[sails.config.custom.oidcRolesAttribute])) {
|
||||||
|
const userRoles = new Set(oidcUser[sails.config.custom.oidcRolesAttribute]);
|
||||||
|
isAdmin = sails.config.custom.oidcAdminRoles.findIndex((role) => userRoles.has(role)) > -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const newUser = {
|
||||||
|
email: oidcUser.email,
|
||||||
|
isAdmin,
|
||||||
|
name: oidcUser.name,
|
||||||
|
username: oidcUser.preferred_username,
|
||||||
|
subscribeToOwnCards: false,
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
locked: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!newUser.email || !newUser.username || !newUser.name) {
|
||||||
|
sails.log.error(Errors.MISSING_VALUES.missingValues);
|
||||||
|
throw Errors.MISSING_VALUES;
|
||||||
|
}
|
||||||
|
|
||||||
|
const identityProviderUser = await IdentityProviderUser.findOne({
|
||||||
|
where: {
|
||||||
|
issuer: oidcUser.iss,
|
||||||
|
sub: oidcUser.sub,
|
||||||
|
},
|
||||||
|
}).populate('userId');
|
||||||
|
|
||||||
|
let user = identityProviderUser ? identityProviderUser.userId : {};
|
||||||
|
if (!identityProviderUser) {
|
||||||
|
user = await getOrCreateUser(newUser);
|
||||||
|
await IdentityProviderUser.create({
|
||||||
|
issuer: oidcUser.iss,
|
||||||
|
sub: oidcUser.sub,
|
||||||
|
userId: user.id,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const controlledFields = ['email', 'password', 'isAdmin', 'name', 'username'];
|
||||||
|
const updateFields = {};
|
||||||
|
controlledFields.forEach((field) => {
|
||||||
|
if (user[field] !== newUser[field]) {
|
||||||
|
updateFields[field] = newUser[field];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (Object.keys(updateFields).length > 0) {
|
||||||
|
updateFields.updatedAt = now;
|
||||||
|
await User.updateOne({ id: user.id }).set(updateFields);
|
||||||
|
}
|
||||||
|
|
||||||
|
const plankaToken = sails.helpers.utils.createToken(user.id);
|
||||||
|
|
||||||
|
const remoteAddress = getRemoteAddress(this.req);
|
||||||
|
await Session.create({
|
||||||
|
accessToken: plankaToken,
|
||||||
|
remoteAddress,
|
||||||
|
userId: user.id,
|
||||||
|
userAgent: this.req.headers['user-agent'],
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
item: plankaToken,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
module.exports = {
|
||||||
|
async fn() {
|
||||||
|
const config = {
|
||||||
|
authority: sails.config.custom.oidcIssuer,
|
||||||
|
clientId: sails.config.custom.oidcClientId,
|
||||||
|
redirectUri: sails.config.custom.oidcredirectUri,
|
||||||
|
scopes: sails.config.custom.oidcScopes,
|
||||||
|
};
|
||||||
|
return config;
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
fn() {
|
|
||||||
let oidc = null;
|
|
||||||
if (sails.hooks.oidc.isActive()) {
|
|
||||||
const oidcClient = sails.hooks.oidc.getClient();
|
|
||||||
|
|
||||||
oidc = {
|
|
||||||
authorizationUrl: oidcClient.authorizationUrl({
|
|
||||||
scope: sails.config.custom.oidcScopes,
|
|
||||||
response_mode: 'fragment',
|
|
||||||
}),
|
|
||||||
endSessionUrl: oidcClient.issuer.end_session_endpoint ? oidcClient.endSessionUrl({}) : null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
item: {
|
|
||||||
oidc,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
NOT_ENOUGH_RIGHTS: {
|
|
||||||
notEnoughRights: 'Not enough rights',
|
|
||||||
},
|
|
||||||
USER_NOT_FOUND: {
|
USER_NOT_FOUND: {
|
||||||
userNotFound: 'User not found',
|
userNotFound: 'User not found',
|
||||||
},
|
},
|
||||||
@@ -17,9 +14,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
notEnoughRights: {
|
|
||||||
responseType: 'forbidden',
|
|
||||||
},
|
|
||||||
userNotFound: {
|
userNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -33,7 +27,7 @@ module.exports = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (user.email === sails.config.custom.defaultAdminEmail) {
|
if (user.email === sails.config.custom.defaultAdminEmail) {
|
||||||
throw Errors.NOT_ENOUGH_RIGHTS;
|
throw Errors.USER_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
user = await sails.helpers.users.deleteOne.with({
|
user = await sails.helpers.users.deleteOne.with({
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
const bcrypt = require('bcrypt');
|
const bcrypt = require('bcrypt');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
NOT_ENOUGH_RIGHTS: {
|
|
||||||
notEnoughRights: 'Not enough rights',
|
|
||||||
},
|
|
||||||
USER_NOT_FOUND: {
|
USER_NOT_FOUND: {
|
||||||
userNotFound: 'User not found',
|
userNotFound: 'User not found',
|
||||||
},
|
},
|
||||||
@@ -34,9 +31,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
notEnoughRights: {
|
|
||||||
responseType: 'forbidden',
|
|
||||||
},
|
|
||||||
userNotFound: {
|
userNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -65,8 +59,8 @@ module.exports = {
|
|||||||
throw Errors.USER_NOT_FOUND;
|
throw Errors.USER_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.email === sails.config.custom.defaultAdminEmail || user.isSso) {
|
if (user.email === sails.config.custom.defaultAdminEmail) {
|
||||||
throw Errors.NOT_ENOUGH_RIGHTS;
|
throw Errors.USER_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
|||||||
@@ -4,9 +4,6 @@ const zxcvbn = require('zxcvbn');
|
|||||||
const { getRemoteAddress } = require('../../../utils/remoteAddress');
|
const { getRemoteAddress } = require('../../../utils/remoteAddress');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
NOT_ENOUGH_RIGHTS: {
|
|
||||||
notEnoughRights: 'Not enough rights',
|
|
||||||
},
|
|
||||||
USER_NOT_FOUND: {
|
USER_NOT_FOUND: {
|
||||||
userNotFound: 'User not found',
|
userNotFound: 'User not found',
|
||||||
},
|
},
|
||||||
@@ -36,9 +33,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
notEnoughRights: {
|
|
||||||
responseType: 'forbidden',
|
|
||||||
},
|
|
||||||
userNotFound: {
|
userNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -64,8 +58,8 @@ module.exports = {
|
|||||||
throw Errors.USER_NOT_FOUND;
|
throw Errors.USER_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.email === sails.config.custom.defaultAdminEmail || user.isSso) {
|
if (user.email === sails.config.custom.defaultAdminEmail) {
|
||||||
throw Errors.NOT_ENOUGH_RIGHTS;
|
throw Errors.USER_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
const bcrypt = require('bcrypt');
|
const bcrypt = require('bcrypt');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
NOT_ENOUGH_RIGHTS: {
|
|
||||||
notEnoughRights: 'Not enough rights',
|
|
||||||
},
|
|
||||||
USER_NOT_FOUND: {
|
USER_NOT_FOUND: {
|
||||||
userNotFound: 'User not found',
|
userNotFound: 'User not found',
|
||||||
},
|
},
|
||||||
@@ -36,9 +33,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
notEnoughRights: {
|
|
||||||
responseType: 'forbidden',
|
|
||||||
},
|
|
||||||
userNotFound: {
|
userNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -67,8 +61,8 @@ module.exports = {
|
|||||||
throw Errors.USER_NOT_FOUND;
|
throw Errors.USER_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.email === sails.config.custom.defaultAdminEmail || user.isSso) {
|
if (user.email === sails.config.custom.defaultAdminEmail) {
|
||||||
throw Errors.NOT_ENOUGH_RIGHTS;
|
throw Errors.USER_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
|||||||
@@ -72,12 +72,6 @@ module.exports = {
|
|||||||
delete inputs.isAdmin;
|
delete inputs.isAdmin;
|
||||||
delete inputs.name;
|
delete inputs.name;
|
||||||
/* eslint-enable no-param-reassign */
|
/* eslint-enable no-param-reassign */
|
||||||
} else if (user.isSso) {
|
|
||||||
if (!sails.config.custom.oidcIgnoreRoles) {
|
|
||||||
delete inputs.isAdmin; // eslint-disable-line no-param-reassign
|
|
||||||
}
|
|
||||||
|
|
||||||
delete inputs.name; // eslint-disable-line no-param-reassign
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const values = {
|
const values = {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ const valuesValidator = (value) => {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_.isNil(value.password) && !_.isString(value.password)) {
|
if (!_.isString(value.password)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,10 +40,6 @@ module.exports = {
|
|||||||
async fn(inputs) {
|
async fn(inputs) {
|
||||||
const { values } = inputs;
|
const { values } = inputs;
|
||||||
|
|
||||||
if (values.password) {
|
|
||||||
values.password = bcrypt.hashSync(values.password, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (values.username) {
|
if (values.username) {
|
||||||
values.username = values.username.toLowerCase();
|
values.username = values.username.toLowerCase();
|
||||||
}
|
}
|
||||||
@@ -51,6 +47,7 @@ module.exports = {
|
|||||||
const user = await User.create({
|
const user = await User.create({
|
||||||
...values,
|
...values,
|
||||||
email: values.email.toLowerCase(),
|
email: values.email.toLowerCase(),
|
||||||
|
password: bcrypt.hashSync(values.password, 10),
|
||||||
})
|
})
|
||||||
.intercept(
|
.intercept(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,10 +10,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async fn(inputs) {
|
async fn(inputs) {
|
||||||
await IdentityProviderUser.destroy({
|
|
||||||
userId: inputs.record.id,
|
|
||||||
});
|
|
||||||
|
|
||||||
await ProjectManager.destroy({
|
await ProjectManager.destroy({
|
||||||
userId: inputs.record.id,
|
userId: inputs.record.id,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,113 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
inputs: {
|
|
||||||
code: {
|
|
||||||
type: 'string',
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
nonce: {
|
|
||||||
type: 'string',
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
exits: {
|
|
||||||
invalidCodeOrNonce: {},
|
|
||||||
missingValues: {},
|
|
||||||
emailAlreadyInUse: {},
|
|
||||||
usernameAlreadyInUse: {},
|
|
||||||
},
|
|
||||||
|
|
||||||
async fn(inputs) {
|
|
||||||
const client = sails.hooks.oidc.getClient();
|
|
||||||
|
|
||||||
let userInfo;
|
|
||||||
try {
|
|
||||||
const tokenSet = await client.callback(
|
|
||||||
sails.config.custom.oidcRedirectUri,
|
|
||||||
{ code: inputs.code },
|
|
||||||
{ nonce: inputs.nonce },
|
|
||||||
);
|
|
||||||
userInfo = await client.userinfo(tokenSet);
|
|
||||||
} catch (e) {
|
|
||||||
sails.log.warn(`Error while exchanging OIDC code: ${e}`);
|
|
||||||
throw 'invalidCodeOrNonce';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!userInfo.email || !userInfo.name) {
|
|
||||||
throw 'missingValues';
|
|
||||||
}
|
|
||||||
|
|
||||||
let isAdmin = false;
|
|
||||||
if (sails.config.custom.oidcAdminRoles.includes('*')) {
|
|
||||||
isAdmin = true;
|
|
||||||
} else {
|
|
||||||
const roles = userInfo[sails.config.custom.oidcRolesAttribute];
|
|
||||||
if (Array.isArray(roles)) {
|
|
||||||
// Use a Set here to avoid quadratic time complexity
|
|
||||||
const userRoles = new Set(userInfo[sails.config.custom.oidcRolesAttribute]);
|
|
||||||
isAdmin = sails.config.custom.oidcAdminRoles.findIndex((role) => userRoles.has(role)) > -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const values = {
|
|
||||||
isAdmin,
|
|
||||||
email: userInfo.email,
|
|
||||||
isSso: true,
|
|
||||||
name: userInfo.name,
|
|
||||||
username: userInfo.preferred_username,
|
|
||||||
subscribeToOwnCards: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
let user;
|
|
||||||
// This whole block technically needs to be executed in a transaction
|
|
||||||
// with SERIALIZABLE isolation level (but Waterline does not support
|
|
||||||
// that), so this will result in errors if for example users are deleted
|
|
||||||
// concurrently with logging in via OIDC.
|
|
||||||
let identityProviderUser = await IdentityProviderUser.findOne({
|
|
||||||
issuer: sails.config.custom.oidcIssuer,
|
|
||||||
sub: userInfo.sub,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (identityProviderUser) {
|
|
||||||
user = await sails.helpers.users.getOne(identityProviderUser.userId);
|
|
||||||
} else {
|
|
||||||
// If no IDP/User mapping exists, search for the user by email.
|
|
||||||
user = await sails.helpers.users.getOne({
|
|
||||||
email: values.email.toLowerCase(),
|
|
||||||
});
|
|
||||||
|
|
||||||
// Otherwise, create a new user.
|
|
||||||
if (!user) {
|
|
||||||
user = await sails.helpers.users
|
|
||||||
.createOne(values)
|
|
||||||
.intercept('usernameAlreadyInUse', 'usernameAlreadyInUse');
|
|
||||||
}
|
|
||||||
|
|
||||||
identityProviderUser = await IdentityProviderUser.create({
|
|
||||||
userId: user.id,
|
|
||||||
issuer: sails.config.custom.oidcIssuer,
|
|
||||||
sub: userInfo.sub,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateFieldKeys = ['email', 'isSso', 'name', 'username'];
|
|
||||||
if (!sails.config.custom.oidcIgnoreRoles) {
|
|
||||||
updateFieldKeys.push('isAdmin');
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateValues = {};
|
|
||||||
// eslint-disable-next-line no-restricted-syntax
|
|
||||||
for (const k of updateFieldKeys) {
|
|
||||||
if (values[k] !== user[k]) updateValues[k] = values[k];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Object.keys(updateValues).length > 0) {
|
|
||||||
user = await sails.helpers.users
|
|
||||||
.updateOne(user, updateValues, {}) // FIXME: hack for last parameter
|
|
||||||
.intercept('emailAlreadyInUse', 'emailAlreadyInUse')
|
|
||||||
.intercept('usernameAlreadyInUse', 'usernameAlreadyInUse');
|
|
||||||
}
|
|
||||||
|
|
||||||
return user;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
const openidClient = require('openid-client');
|
|
||||||
|
|
||||||
module.exports = function oidcServiceHook(sails) {
|
|
||||||
let client = null;
|
|
||||||
|
|
||||||
return {
|
|
||||||
/**
|
|
||||||
* Runs when this Sails app loads/lifts.
|
|
||||||
*/
|
|
||||||
|
|
||||||
async initialize() {
|
|
||||||
if (sails.config.custom.oidcIssuer) {
|
|
||||||
const issuer = await openidClient.Issuer.discover(sails.config.custom.oidcIssuer);
|
|
||||||
|
|
||||||
client = new issuer.Client({
|
|
||||||
client_id: sails.config.custom.oidcClientId,
|
|
||||||
client_secret: sails.config.custom.oidcClientSecret,
|
|
||||||
redirect_uris: [sails.config.custom.oidcRedirectUri],
|
|
||||||
response_types: ['code'],
|
|
||||||
});
|
|
||||||
sails.log.info('OIDC hook has been loaded successfully');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
getClient() {
|
|
||||||
return client;
|
|
||||||
},
|
|
||||||
|
|
||||||
isActive() {
|
|
||||||
return client !== null;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@@ -24,11 +24,6 @@ module.exports = {
|
|||||||
defaultsTo: false,
|
defaultsTo: false,
|
||||||
columnName: 'is_admin',
|
columnName: 'is_admin',
|
||||||
},
|
},
|
||||||
isSso: {
|
|
||||||
type: 'boolean',
|
|
||||||
defaultsTo: false,
|
|
||||||
columnName: 'is_sso',
|
|
||||||
},
|
|
||||||
name: {
|
name: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
required: true,
|
required: true,
|
||||||
@@ -72,6 +67,10 @@ module.exports = {
|
|||||||
type: 'ref',
|
type: 'ref',
|
||||||
columnName: 'password_changed_at',
|
columnName: 'password_changed_at',
|
||||||
},
|
},
|
||||||
|
locked: {
|
||||||
|
type: 'boolean',
|
||||||
|
columnName: 'locked',
|
||||||
|
},
|
||||||
|
|
||||||
// ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
|
// ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
|
||||||
// ║╣ ║║║╠╩╗║╣ ║║╚═╗
|
// ║╣ ║║║╠╩╗║╣ ║║╚═╗
|
||||||
@@ -110,16 +109,12 @@ module.exports = {
|
|||||||
tableName: 'user_account',
|
tableName: 'user_account',
|
||||||
|
|
||||||
customToJSON() {
|
customToJSON() {
|
||||||
const isDefaultAdmin = this.email === sails.config.custom.defaultAdminEmail;
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
..._.omit(this, ['password', 'isSso', 'avatar', 'passwordChangedAt']),
|
..._.omit(this, ['password', 'avatar', 'passwordChangedAt']),
|
||||||
isLocked: this.isSso || isDefaultAdmin,
|
|
||||||
isRoleLocked: (this.isSso && !sails.config.custom.oidcIgnoreRoles) || isDefaultAdmin,
|
|
||||||
isDeletionLocked: isDefaultAdmin,
|
|
||||||
avatarUrl:
|
avatarUrl:
|
||||||
this.avatar &&
|
this.avatar &&
|
||||||
`${sails.config.custom.userAvatarsUrl}/${this.avatar.dirname}/square-100.${this.avatar.extension}`,
|
`${sails.config.custom.userAvatarsUrl}/${this.avatar.dirname}/square-100.${this.avatar.extension}`,
|
||||||
|
isLocked: this.email === sails.config.custom.defaultAdminEmail,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
+7
-10
@@ -31,18 +31,15 @@ module.exports.custom = {
|
|||||||
attachmentsPath: path.join(sails.config.appPath, 'private', 'attachments'),
|
attachmentsPath: path.join(sails.config.appPath, 'private', 'attachments'),
|
||||||
attachmentsUrl: `${process.env.BASE_URL}/attachments`,
|
attachmentsUrl: `${process.env.BASE_URL}/attachments`,
|
||||||
|
|
||||||
defaultAdminEmail: process.env.DEFAULT_ADMIN_EMAIL,
|
|
||||||
|
|
||||||
oidcIssuer: process.env.OIDC_ISSUER,
|
oidcIssuer: process.env.OIDC_ISSUER,
|
||||||
|
oidcAudience: process.env.OIDC_AUDIENCE,
|
||||||
oidcClientId: process.env.OIDC_CLIENT_ID,
|
oidcClientId: process.env.OIDC_CLIENT_ID,
|
||||||
oidcClientSecret: process.env.OIDC_CLIENT_SECRET,
|
|
||||||
oidcScopes: process.env.OIDC_SCOPES || 'openid email profile',
|
|
||||||
oidcAdminRoles: process.env.OIDC_ADMIN_ROLES ? process.env.OIDC_ADMIN_ROLES.split(',') : [],
|
|
||||||
oidcRolesAttribute: process.env.OIDC_ROLES_ATTRIBUTE || 'groups',
|
oidcRolesAttribute: process.env.OIDC_ROLES_ATTRIBUTE || 'groups',
|
||||||
oidcIgnoreRoles: process.env.OIDC_IGNORE_ROLES === 'true',
|
oidcAdminRoles: process.env.OIDC_ADMIN_ROLES ? process.env.OIDC_ADMIN_ROLES.split(',') : [],
|
||||||
|
oidcredirectUri: process.env.OIDC_REDIRECT_URI,
|
||||||
|
oidcJwksUri: process.env.OIDC_JWKS_URI,
|
||||||
|
oidcScopes: process.env.OIDC_SCOPES || 'openid profile email',
|
||||||
|
oidcSkipUserInfo: process.env.OIDC_SKIP_USER_INFO === 'true',
|
||||||
|
|
||||||
// TODO: move client base url to environment variable?
|
defaultAdminEmail: process.env.DEFAULT_ADMIN_EMAIL,
|
||||||
oidcRedirectUri: `${
|
|
||||||
sails.config.environment === 'production' ? process.env.BASE_URL : 'http://localhost:3000'
|
|
||||||
}/oidc-callback`,
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ module.exports.policies = {
|
|||||||
|
|
||||||
'projects/create': ['is-authenticated', 'is-admin'],
|
'projects/create': ['is-authenticated', 'is-admin'],
|
||||||
|
|
||||||
'show-config': true,
|
|
||||||
'access-tokens/create': true,
|
'access-tokens/create': true,
|
||||||
'access-tokens/exchange-using-oidc': true,
|
'access-tokens/exchange': true,
|
||||||
|
'appconfig/index': true,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,10 +9,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
module.exports.routes = {
|
module.exports.routes = {
|
||||||
'GET /api/config': 'show-config',
|
'GET /api/appconfig': 'appconfig/index',
|
||||||
|
|
||||||
'POST /api/access-tokens': 'access-tokens/create',
|
'POST /api/access-tokens': 'access-tokens/create',
|
||||||
'POST /api/access-tokens/exchange-using-oidc': 'access-tokens/exchange-using-oidc',
|
'POST /api/access-tokens/exchange': 'access-tokens/exchange',
|
||||||
'DELETE /api/access-tokens/me': 'access-tokens/delete',
|
'DELETE /api/access-tokens/me': 'access-tokens/delete',
|
||||||
|
|
||||||
'GET /api/users': 'users/index',
|
'GET /api/users': 'users/index',
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
module.exports.up = (knex) =>
|
||||||
|
knex.schema.createTable('identity_provider_user', (table) => {
|
||||||
|
/* Columns */
|
||||||
|
|
||||||
|
table.bigInteger('id').primary().defaultTo(knex.raw('next_id()'));
|
||||||
|
table.timestamp('created_at', true);
|
||||||
|
table.timestamp('updated_at', true);
|
||||||
|
|
||||||
|
table
|
||||||
|
.bigInteger('user_id')
|
||||||
|
.notNullable()
|
||||||
|
.references('id')
|
||||||
|
.inTable('user_account')
|
||||||
|
.onDelete('CASCADE');
|
||||||
|
|
||||||
|
table.text('issuer').notNullable();
|
||||||
|
table.text('sub').notNullable();
|
||||||
|
|
||||||
|
/* Indexes */
|
||||||
|
|
||||||
|
table.index('user_id');
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports.down = (knex) => knex.schema.dropTable('identity_provider_user');
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
module.exports.up = async (knex) => {
|
|
||||||
await knex.schema.createTable('identity_provider_user', (table) => {
|
|
||||||
/* Columns */
|
|
||||||
|
|
||||||
table.bigInteger('id').primary().defaultTo(knex.raw('next_id()'));
|
|
||||||
|
|
||||||
table.bigInteger('user_id').notNullable();
|
|
||||||
|
|
||||||
table.text('issuer').notNullable();
|
|
||||||
table.text('sub').notNullable();
|
|
||||||
|
|
||||||
table.timestamp('created_at', true);
|
|
||||||
table.timestamp('updated_at', true);
|
|
||||||
|
|
||||||
/* Indexes */
|
|
||||||
|
|
||||||
table.unique(['issuer', 'sub']);
|
|
||||||
table.index('user_id');
|
|
||||||
});
|
|
||||||
|
|
||||||
await knex.schema.table('user_account', (table) => {
|
|
||||||
/* Columns */
|
|
||||||
|
|
||||||
table.boolean('is_sso').notNullable().default(false);
|
|
||||||
|
|
||||||
/* Modifications */
|
|
||||||
|
|
||||||
table.setNullable('password');
|
|
||||||
});
|
|
||||||
|
|
||||||
return knex.schema.alterTable('user_account', (table) => {
|
|
||||||
table.boolean('is_sso').notNullable().alter();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.down = async (knex) => {
|
|
||||||
await knex.schema.dropTable('identity_provider_user');
|
|
||||||
|
|
||||||
return knex.schema.table('user_account', (table) => {
|
|
||||||
table.dropColumn('is_sso');
|
|
||||||
|
|
||||||
table.dropNullable('password');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user