diff --git a/.prettierrc b/.prettierrc index 6b2571e..21c6d0f 100644 --- a/.prettierrc +++ b/.prettierrc @@ -6,6 +6,6 @@ "singleQuote": false, "trailingComma": "es5", "bracketSpacing": true, - "jsxBracketSameLine": false, + "bracketSameLine": false, "arrowParens": "avoid" } diff --git a/.travis.yml b/.travis.yml index 38d82bd..37c5de1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js node_js: - - lts/* + - 17 cache: yarn diff --git a/README.md b/README.md index 15b48d3..5fdecbd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ +[![GitHub license](https://img.shields.io/github/license/Awesome-Technologies/synapse-admin)](https://github.com/Awesome-Technologies/synapse-admin/blob/master/LICENSE) [![Build Status](https://travis-ci.org/Awesome-Technologies/synapse-admin.svg?branch=master)](https://travis-ci.org/Awesome-Technologies/synapse-admin) [![build-test](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml/badge.svg)](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml) +[![gh-pages](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/edge_ghpage.yml/badge.svg)](https://awesome-technologies.github.io/synapse-admin/) +[![docker-release](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/docker-release.yml/badge.svg)](https://hub.docker.com/r/awesometechnologies/synapse-admin) +[![github-release](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/github-release.yml/badge.svg)](https://github.com/Awesome-Technologies/synapse-admin/releases) # Synapse admin ui diff --git a/src/components/users.js b/src/components/users.js index 5c045fd..29879e4 100644 --- a/src/components/users.js +++ b/src/components/users.js @@ -259,20 +259,31 @@ export function generateRandomUser() { }; } -const UserEditToolbar = props => { +const UserEditToolbar = props => ( + + + +); + +const UserEditActions = ({ data }) => { const translate = useTranslate(); + var userStatus = ""; + if (data) { + userStatus = data.deactivated; + } + return ( - - + + {!userStatus && } - - + ); }; @@ -334,7 +345,7 @@ export const UserEdit = props => { const classes = useStyles(); const translate = useTranslate(); return ( - }> + } actions={}> }>