From 26ed63d65e83e6ba8fbc5b3180c74a2db8761ecb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 17:20:29 +0100 Subject: [PATCH 1/6] Bump follow-redirects from 1.14.6 to 1.14.7 (#227) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6ca4934..1db72d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5290,9 +5290,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.14.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" - integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== for-in@^1.0.2: version "1.0.2" From c4f0fa48ec24a24ed75fbb7d0b04ece7d4f39123 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 17:20:39 +0100 Subject: [PATCH 2/6] Bump nanoid from 3.1.30 to 3.2.0 (#229) Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1db72d4..adf2277 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7743,9 +7743,9 @@ nan@^2.12.1: integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== nanoid@^3.1.30: - version "3.1.30" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" - integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== nanomatch@^1.2.9: version "1.2.13" From c4a68ff1d5345f06c61e9e07a05caf70d52c5532 Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 31 Jan 2022 17:24:37 +0100 Subject: [PATCH 3/6] Fix typo in `.prettierrc` (#224) --- .prettierrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index 17335ee..6b2571e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -7,5 +7,5 @@ "trailingComma": "es5", "bracketSpacing": true, "jsxBracketSameLine": false, - "arrowParens": "avoid", + "arrowParens": "avoid" } From 3fb33facc58aee325c92e835971b7baf4366e5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= Date: Mon, 31 Jan 2022 17:38:34 +0100 Subject: [PATCH 4/6] GitHub Pages Deploy (#189) * Create edge_ghpage.yml Added Build and Deploy Edge version to GH Pages * Update edge_ghpage.yml Added missing node setup * Update edge_ghpage.yml Restrict building of GH Pages to main / master branch & workflow dispatch * Update .github/workflows/edge_ghpage.yml Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> * Update .github/workflows/edge_ghpage.yml Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> * Update .github/workflows/edge_ghpage.yml Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> * Update .github/workflows/edge_ghpage.yml Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> --- .github/workflows/edge_ghpage.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/edge_ghpage.yml diff --git a/.github/workflows/edge_ghpage.yml b/.github/workflows/edge_ghpage.yml new file mode 100644 index 0000000..e229523 --- /dev/null +++ b/.github/workflows/edge_ghpage.yml @@ -0,0 +1,26 @@ +name: Build and Deploy Edge version to GH Pages +on: + workflow_dispatch: + push: + branches: + - main + - master +jobs: + build-and-deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout 🛎️ + uses: actions/checkout@v2.3.1 + - uses: actions/setup-node@v2 + with: + node-version: "14" + - name: Install and Build 🔧 + run: | + yarn install + yarn build + + - name: Deploy 🚀 + uses: JamesIves/github-pages-deploy-action@4.1.5 + with: + branch: gh-pages + folder: build From b90d4ef00fa03400c81387eb3594ea9f8831f34f Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 31 Jan 2022 17:39:18 +0100 Subject: [PATCH 5/6] Add more headlines for installation to README (#216) --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index dbc4ded..1ab9552 100644 --- a/README.md +++ b/README.md @@ -19,15 +19,15 @@ You need access to the following endpoints: See also [Synapse administration endpoints](https://matrix-org.github.io/synapse/develop/reverse_proxy.html#synapse-administration-endpoints) -## Step-By-Step install: +## Step-By-Step install You have three options: -1. Download the tarball and serve with any webserver -2. Download the source code from github and run using nodejs -3. Run the Docker container +1. [Download the tarball and serve with any webserver](#steps-for-1) +2. [Download the source code from github and run using nodejs](#steps-for-2) +3. [Run the Docker container](#steps-for-3) -Steps for 1): +### Steps for 1) - make sure you have a webserver installed that can serve static files (any webserver like nginx or apache will do) - configure a vhost for synapse admin on your webserver @@ -36,7 +36,7 @@ Steps for 1): - move or symlink the `synapse-admin-x.x.x` into your vhosts root dir - open the url of the vhost in your browser -Steps for 2): +### Steps for 2) - make sure you have installed the following: git, yarn, nodejs - download the source code: `git clone https://github.com/Awesome-Technologies/synapse-admin.git` @@ -49,7 +49,7 @@ Either you define it at startup (e.g. `REACT_APP_SERVER=https://yourmatrixserver or by editing it in the [.env](.env) file. See also the [documentation](https://create-react-app.dev/docs/adding-custom-environment-variables/). -Steps for 3): +### Steps for 3) - run the Docker container from the public docker registry: `docker run -p 8080:80 awesometechnologies/synapse-admin` or use the [docker-compose.yml](docker-compose.yml): `docker-compose up -d` From 0f4c382c18f2ab1b8e668d83f8e5e5c2fc6d20c0 Mon Sep 17 00:00:00 2001 From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 31 Jan 2022 17:50:14 +0100 Subject: [PATCH 6/6] Remove not needed translation `backtolist` (#208) --- src/i18n/de.js | 1 - src/i18n/en.js | 1 - src/i18n/zh.js | 1 - 3 files changed, 3 deletions(-) diff --git a/src/i18n/de.js b/src/i18n/de.js index 66a8a05..ced6512 100644 --- a/src/i18n/de.js +++ b/src/i18n/de.js @@ -96,7 +96,6 @@ const de = { }, resources: { users: { - backtolist: "Zurück zur Liste", name: "Benutzer", email: "E-Mail", msisdn: "Telefon", diff --git a/src/i18n/en.js b/src/i18n/en.js index 51ba6ca..5ceaed9 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -95,7 +95,6 @@ const en = { }, resources: { users: { - backtolist: "Back to list", name: "User |||| Users", email: "Email", msisdn: "Phone", diff --git a/src/i18n/zh.js b/src/i18n/zh.js index 06666ba..3c36366 100644 --- a/src/i18n/zh.js +++ b/src/i18n/zh.js @@ -98,7 +98,6 @@ const zh = { }, resources: { users: { - backtolist: "回到列表", name: "用户", email: "邮箱", msisdn: "电话",