michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into feat/key-backup

Browse source
This commit is contained in:
Ajay Bura 2022-04-23 19:12:11 +05:30
commit 848cbb1066
16 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-pull-request.yml vendored
View file

@ -11,7 +11,7 @@ jobs:
PR_NUMBER: ${{github.event.number}}
steps:
- name: Checkout repository
uses: actions/checkout@v3.0.0
uses: actions/checkout@v3.0.1
- name: Build app
run: npm ci && npm run build
- name: Upload artifact

2
.github/workflows/deploy-pull-request.yml vendored
View file

@ -68,7 +68,7 @@ jobs:
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE3_ID }}
timeout-minutes: 1
- name: Edit PR Description
uses: velas/pr-description@v1.0.1
uses: Beakyn/gha-comment-pull-request@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:

5
.github/workflows/docker-pr.yml vendored
View file

@ -2,8 +2,9 @@ name: 'Docker check'
on:
pull_request:
paths:
paths:
- 'Dockerfile'
- '.github/workflows/docker-pr.yml'
jobs:
docker-build:
@ -12,7 +13,7 @@ jobs:
PR_NUMBER: ${{github.event.number}}
steps:
- name: Checkout repository
uses: actions/checkout@v3.0.0
uses: actions/checkout@v3.0.1
- name: Build Docker image
uses: docker/build-push-action@v2.10.0
with:

2
.github/workflows/netlify-dev.yml vendored
View file

@ -12,7 +12,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3.0.0
uses: actions/checkout@v3.0.1
- name: Build and deploy to Netlify
uses: jsmrcaga/action-netlify-deploy@v1.7.2
with:

4
.github/workflows/prod-deploy.yml vendored
View file

@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3.0.0
uses: actions/checkout@v3.0.1
- name: Build and deploy to Netlify
uses: jsmrcaga/action-netlify-deploy@v1.7.2
with:
@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3.0.0
uses: actions/checkout@v3.0.1
- name: Login to Docker Hub
uses: docker/login-action@v1.14.1
with:

2
Dockerfile
View file

@ -1,5 +1,5 @@
## Builder
FROM node:17.8.0-alpine3.15 as builder
FROM node:17.9.0-alpine3.15 as builder
WORKDIR /src

46
package-lock.json generated
View file

@ -20,7 +20,7 @@
"file-saver": "^2.0.5",
"flux": "^4.0.3",
"formik": "^2.2.9",
"html-react-parser": "^1.4.9",
"html-react-parser": "^1.4.11",
"linkifyjs": "^2.1.9",
"matrix-js-sdk": "^17.0.0",
"micromark": "^3.0.10",
@ -58,7 +58,7 @@
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-react-hooks": "^4.4.0",
"favicons": "^6.2.2",
"favicons-webpack-plugin": "^5.0.2",
"html-loader": "^3.1.0",
@ -5828,9 +5828,9 @@
}
},
"node_modules/eslint-plugin-react-hooks": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
"integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz",
"integrity": "sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ==",
"dev": true,
"engines": {
"node": ">=10"
@ -7199,9 +7199,9 @@
}
},
"node_modules/html-dom-parser": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-1.1.1.tgz",
"integrity": "sha512-ddijSO0GluZEdlLNmiAjFI+CkAgzUgf8n3vpitQhvlsniPMbCSWtu+QYmioaVmEN0stytm9C38p6SsTDthv0cA==",
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-1.2.0.tgz",
"integrity": "sha512-2HIpFMvvffsXHFUFjso0M9LqM+1Lm22BF+Df2ba+7QHJXjk63pWChEnI6YG27eaWqUdfnh5/Vy+OXrNTtepRsg==",
"dependencies": {
"domhandler": "4.3.1",
"htmlparser2": "7.2.0"
@ -7284,17 +7284,17 @@
}
},
"node_modules/html-react-parser": {
"version": "1.4.9",
"resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-1.4.9.tgz",
"integrity": "sha512-V45RVd7GEGtk5bmL9iBV/AkaTE6jj9uhvUrJ/cWlq06DrcMzvz2kqMeZfWEV2pIWkRDzLAqrotCfmFSvdTjpHA==",
"version": "1.4.11",
"resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-1.4.11.tgz",
"integrity": "sha512-NDSz8MS89I286N7FzNScBtCRBs6MU7w72k+jWk4dBqcTgTrCQHHrIUlryJB9U5MJuKhq5/CFGz0JPPYS6OnjZw==",
"dependencies": {
"domhandler": "4.3.1",
"html-dom-parser": "1.1.1",
"html-dom-parser": "1.2.0",
"react-property": "2.0.0",
"style-to-js": "1.1.0"
},
"peerDependencies": {
"react": "0.14 || 15 || 16 || 17"
"react": "0.14 || 15 || 16 || 17 || 18"
}
},
"node_modules/html-webpack-plugin": {
@ -18505,9 +18505,9 @@
}
},
"eslint-plugin-react-hooks": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
"integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz",
"integrity": "sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ==",
"dev": true,
"requires": {}
},
@ -19484,9 +19484,9 @@
}
},
"html-dom-parser": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-1.1.1.tgz",
"integrity": "sha512-ddijSO0GluZEdlLNmiAjFI+CkAgzUgf8n3vpitQhvlsniPMbCSWtu+QYmioaVmEN0stytm9C38p6SsTDthv0cA==",
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-1.2.0.tgz",
"integrity": "sha512-2HIpFMvvffsXHFUFjso0M9LqM+1Lm22BF+Df2ba+7QHJXjk63pWChEnI6YG27eaWqUdfnh5/Vy+OXrNTtepRsg==",
"requires": {
"domhandler": "4.3.1",
"htmlparser2": "7.2.0"
@ -19542,12 +19542,12 @@
}
},
"html-react-parser": {
"version": "1.4.9",
"resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-1.4.9.tgz",
"integrity": "sha512-V45RVd7GEGtk5bmL9iBV/AkaTE6jj9uhvUrJ/cWlq06DrcMzvz2kqMeZfWEV2pIWkRDzLAqrotCfmFSvdTjpHA==",
"version": "1.4.11",
"resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-1.4.11.tgz",
"integrity": "sha512-NDSz8MS89I286N7FzNScBtCRBs6MU7w72k+jWk4dBqcTgTrCQHHrIUlryJB9U5MJuKhq5/CFGz0JPPYS6OnjZw==",
"requires": {
"domhandler": "4.3.1",
"html-dom-parser": "1.1.1",
"html-dom-parser": "1.2.0",
"react-property": "2.0.0",
"style-to-js": "1.1.0"
}

4
package.json
View file

@ -26,7 +26,7 @@
"file-saver": "^2.0.5",
"flux": "^4.0.3",
"formik": "^2.2.9",
"html-react-parser": "^1.4.9",
"html-react-parser": "^1.4.11",
"linkifyjs": "^2.1.9",
"matrix-js-sdk": "^17.0.0",
"micromark": "^3.0.10",
@ -64,7 +64,7 @@
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-react-hooks": "^4.4.0",
"favicons": "^6.2.2",
"favicons-webpack-plugin": "^5.0.2",
"html-loader": "^3.1.0",

2
src/app/molecules/message/Message.jsx
View file

@ -547,7 +547,7 @@ const MessageOptions = React.memo(({
variant="danger"
iconSrc={BinIC}
onClick={() => {
if (window.confirm('Are you sure you want to delete this event')) {
if (window.confirm('Are you sure that you want to delete this event?')) {
redactEvent(roomId, mEvent.getId());
}
}}

2
src/app/molecules/room-options/RoomOptions.jsx
View file

@ -30,7 +30,7 @@ function RoomOptions({ roomId, afterOptionSelect }) {
afterOptionSelect();
};
const handleLeaveClick = () => {
if (confirm('Are you really want to leave this room?')) {
if (confirm('Are you sure that you want to leave this room?')) {
roomActions.leave(roomId);
afterOptionSelect();
}

2
src/app/molecules/room-profile/RoomProfile.jsx
View file

@ -117,7 +117,7 @@ function RoomProfile({ roomId }) {
const handleAvatarUpload = async (url) => {
if (url === null) {
if (confirm('Are you sure you want to remove avatar?')) {
if (confirm('Are you sure that you want to remove room avatar?')) {
await mx.sendStateEvent(roomId, 'm.room.avatar', { url }, '');
}
} else await mx.sendStateEvent(roomId, 'm.room.avatar', { url }, '');

2
src/app/molecules/space-options/SpaceOptions.jsx
View file

@ -55,7 +55,7 @@ function SpaceOptions({ roomId, afterOptionSelect }) {
};
const handleLeaveClick = () => {
if (confirm('Are you really want to leave this space?')) {
if (confirm('Are you sure that you want to leave this space?')) {
leave(roomId);
afterOptionSelect();
}

2
src/app/organisms/profile-editor/ProfileEditor.jsx
View file

@ -40,7 +40,7 @@ function ProfileEditor({ userId }) {
const handleAvatarUpload = (url) => {
if (url === null) {
if (confirm('Are you sure you want to remove avatar?')) {
if (confirm('Are you sure that you want to remove avatar?')) {
mx.setAvatarUrl('');
setAvatarSrc(null);
}

2
src/app/organisms/room/RoomSettings.jsx
View file

@ -86,7 +86,7 @@ function GeneralSettings({ roomId }) {
<MenuItem
variant="danger"
onClick={() => {
if (confirm('Are you really want to leave this room?')) {
if (confirm('Are you sure that you want to leave this room?')) {
roomActions.leave(roomId);
}
}}

2
src/app/organisms/settings/DeviceManage.jsx
View file

@ -73,7 +73,7 @@ function DeviceManage() {
const handleRemove = async (device, auth = undefined) => {
if (auth === undefined
? window.confirm(`You are about to logout "${device.display_name}" session?`)
? window.confirm(`You are about to logout "${device.display_name}" session.`)
: true
) {
addToProcessing(device);

2
src/app/organisms/space-settings/SpaceSettings.jsx
View file

@ -90,7 +90,7 @@ function GeneralSettings({ roomId }) {
<MenuItem
variant="danger"
onClick={() => {
if (confirm('Are you really want to leave this space?')) {
if (confirm('Are you sure that you want to leave this space?')) {
leave(roomId);
}
}}