Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Sign in CTA, Expired Link back button, invite user email content

Browse source
This commit is contained in:
Muhsin Shah 2024-05-02 00:31:14 +05:30
parent c78b957a05
commit 98cfca2e83
3 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/SignupPage/SignupPage.jsx
View file

@ -135,6 +135,7 @@ class SignupPageComponent extends React.Component {
const shouldShowSignupDisabledCard =
!this.organizationToken && !configs?.enable_sign_up && !configs?.form?.enable_sign_up;
const passwordLabelText = this.organizationToken ? 'Create a password' : 'Password';
const shouldShowSignInCTA = !this.organizationToken;
return (
<div className="page common-auth-section-whole-wrapper">
@ -163,18 +164,22 @@ class SignupPageComponent extends React.Component {
data-cy="workspace-signup-header"
>{`Sign up to the workspace - ${configs?.name}`}</span>
)}
<div className="signup-page-signin-redirect" data-cy="signin-redirect-text">
{this.props.t('loginSignupPage.alreadyHaveAnAccount', `Already have an account? `)} &nbsp;
<Link
to={`/login${
this.paramInviteOrganizationSlug ? `/${this.paramInviteOrganizationSlug}` : ''
}`}
tabIndex="-1"
data-cy="signin-redirect-link"
>
{this.props.t('loginSignupPage.signIn', `Sign in`)}
</Link>
</div>
{shouldShowSignInCTA ? (
<div className="signup-page-signin-redirect" data-cy="signin-redirect-text">
{this.props.t('loginSignupPage.alreadyHaveAnAccount', `Already have an account? `)} &nbsp;
<Link
to={`/login${
this.paramInviteOrganizationSlug ? `/${this.paramInviteOrganizationSlug}` : ''
}`}
tabIndex="-1"
data-cy="signin-redirect-link"
>
{this.props.t('loginSignupPage.signIn', `Sign in`)}
</Link>
</div>
) : (
<div className="mb-3"></div>
)}
{shouldShowSignupDisabledCard ? (
<SignupStatusCard text={'Signup has been disabled by your workspace admin.'} />
) : (

7
frontend/src/SuccessInfoScreen/LinkExpiredInfoScreen.jsx
View file

@ -1,9 +1,8 @@
import React from 'react';
import { ButtonSolid } from '@/_components/AppButton';
import { useNavigate } from 'react-router-dom';
import { getSubpath } from '@/_helpers/routes';
export const LinkExpiredInfoScreen = function LinkExpiredInfoScreen({ show = true }) {
const navigate = useNavigate();
const darkMode = localStorage.getItem('darkMode') === 'true';
return (
@ -30,7 +29,9 @@ export const LinkExpiredInfoScreen = function LinkExpiredInfoScreen({ show = tru
<ButtonSolid
variant="secondary"
className="link-expired-info-btn"
onClick={() => navigate('/signup')}
onClick={() => {
window.location = `${getSubpath() ? getSubpath() : ''}/signup`;
}}
data-cy="back-to-signup-button"
>
Back to signup

10
server/src/mails/invite_user.hbs
View file

@ -10,10 +10,12 @@
<tr>
<td class="padding-y-20">
<p>
{{sender}}
has invited you to join the workspace -
<span class="text-bold">{{organizationName}}</span>. Click the
button below to get started!
{{#if sender}}
{{sender}} has invited you to join the workspace -
{{else}}
You have been invited to join the workspace -
{{/if}}
<span class="text-bold">{{organizationName}}</span>. Click the button below to get started!
</p>
<p class="padding-y-20">
Should you have any questions or need assistance, our support team