From 36fbd70a42c4fb36393de5e26ba211f53a9ea80f Mon Sep 17 00:00:00 2001
From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
Date: Mon, 4 May 2020 19:25:22 +0200
Subject: [PATCH] sync master
---
.prettierrc | 3 +-
package.json | 17 +-
src/App.js | 1 +
src/components/LoginPage.js | 119 +-
src/components/rooms.js | 8 +-
src/components/users.js | 137 ++-
src/i18n/de.js | 46 +-
src/i18n/en.js | 27 +-
src/synapse/authProvider.js | 34 +-
src/synapse/dataProvider.js | 125 +-
yarn.lock | 2311 +++++++++++++++++++----------------
11 files changed, 1645 insertions(+), 1183 deletions(-)
diff --git a/.prettierrc b/.prettierrc
index c3c0ee3..17335ee 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -6,5 +6,6 @@
"singleQuote": false,
"trailingComma": "es5",
"bracketSpacing": true,
- "jsxBracketSameLine": false
+ "jsxBracketSameLine": false,
+ "arrowParens": "avoid",
}
diff --git a/package.json b/package.json
index 0d49bed..7d754fe 100644
--- a/package.json
+++ b/package.json
@@ -4,28 +4,29 @@
"description": "Admin GUI for the Matrix.org server Synapse",
"author": "Awesome Technologies Innovationslabor GmbH",
"license": "Apache-2.0",
+ "homepage": ".",
"repository": {
"type": "git",
"url": "https://github.com/Awesome-Technologies/synapse-admin"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.1.1",
- "@testing-library/react": "^9.4.0",
- "@testing-library/user-event": "^8.1.0",
+ "@testing-library/react": "^10.0.2",
+ "@testing-library/user-event": "^10.0.1",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
- "eslint-config-prettier": "^6.10.0",
+ "eslint-config-prettier": "^6.10.1",
"eslint-plugin-prettier": "^3.1.2",
- "prettier": "^1.19.1"
+ "prettier": "^2.0.0"
},
"dependencies": {
"prop-types": "^15.7.2",
"ra-language-german": "^2.1.2",
- "react": "^16.12.0",
- "react-admin": "^3.1.3",
- "react-dom": "^16.12.0",
- "react-scripts": "^3.3.0"
+ "react": "^16.13.1",
+ "react-admin": "^3.4.0",
+ "react-dom": "^16.13.1",
+ "react-scripts": "^3.4.1"
},
"scripts": {
"start": "react-scripts start",
diff --git a/src/App.js b/src/App.js
index ce37344..238d13b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -36,6 +36,7 @@ const App = () => (
icon={UserIcon}
/>