jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change(ui) - disable delete for owner, login page error message alignment (#1099)

Browse source 
* change(ui) - super admin label to owner

* fix(ui) - login page error alignment
This commit is contained in:
Shekar Siri 2023-04-03 17:45:29 +02:00 • committed by GitHub
parent efee2f7172
commit 752e2d6621
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/app/components/Client/Users/components/UserForm/UserForm.tsx
View file

@ -136,6 +136,7 @@ function UserForm(props: Props) {
</div> </div>
<div> <div>
<Button <Button
disabled={user.isSuperAdmin}
data-hidden={ !user.exists() } data-hidden={ !user.exists() }
onClick={ deleteHandler } onClick={ deleteHandler }
> >

2
frontend/app/components/Header/UserMenu/UserMenu.tsx
View file

@ -36,7 +36,7 @@ function UserMenu(props: RouteComponentProps<Props>) {
{account.email} {account.email}
</div> </div>
<div className="rounded-full bg-gray-light flex items-center px-2 color-gray-medium text-sm w-fit text-center"> <div className="rounded-full bg-gray-light flex items-center px-2 color-gray-medium text-sm w-fit text-center">
{account.superAdmin ? 'Super Admin' : account.admin ? 'Admin' : 'Member'} {account.superAdmin ? 'Owner' : account.admin ? 'Admin' : 'Member'}
</div> </div>
</div> </div>
</div> </div>

17
frontend/app/components/Login/Login.js
View file

@ -91,17 +91,6 @@ class Login extends React.Component {
<div className="border rounded bg-white"> <div className="border rounded bg-white">
<Form onSubmit={this.onSubmit} className="flex items-center justify-center flex-col"> <Form onSubmit={this.onSubmit} className="flex items-center justify-center flex-col">
<h2 className="text-center text-2xl font-medium mb-6 border-b p-5 w-full">Login to your account</h2> <h2 className="text-center text-2xl font-medium mb-6 border-b p-5 w-full">Login to your account</h2>
<div className="">
{!authDetails.tenants && (
<div className="text-center text-xl">
Don't have an account?{' '}
<span className="link">
<Link to={SIGNUP_ROUTE}>Sign up</Link>
</span>
</div>
)}
</div>
<Loader loading={loading}> <Loader loading={loading}>
{CAPTCHA_ENABLED && ( {CAPTCHA_ENABLED && (
<ReCAPTCHA <ReCAPTCHA
@ -143,9 +132,9 @@ class Login extends React.Component {
</div> </div>
</Loader> </Loader>
{errors && errors.length ? ( {errors && errors.length ? (
<div className={stl.errors}> <div className="px-8 my-2 w-full">
{errors.map((error) => ( {errors.map((error) => (
<div className={stl.errorItem}> <div className="flex items-center bg-red-lightest rounded p-3">
<Icon name="info" color="red" size="20" /> <Icon name="info" color="red" size="20" />
<span className="color-red ml-2"> <span className="color-red ml-2">
{error} {error}
@ -161,7 +150,7 @@ class Login extends React.Component {
{'Login'} {'Login'}
</Button> </Button>
<div className="my-8"> <div className="my-8 text-center">
<span className="color-gray-medium">Having trouble logging in?</span> <Link to={FORGOT_PASSWORD} className="link ml-1">{'Reset password'}</Link> <span className="color-gray-medium">Having trouble logging in?</span> <Link to={FORGOT_PASSWORD} className="link ml-1">{'Reset password'}</Link>
</div> </div>
</div> </div>