Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Make it more visible that user invites can be accepted by logging in, in addition to signing up #5077

Merged
merged 1 commit into from
Feb 6, 2025
Merged

feat: Make it more visible that user invites can be accepted by logging in, in addition to signing up #5077

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 27 additions & 24 deletions frontend/web/components/pages/HomePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ const HomePage = class extends React.Component {
// can handle always setting the marketing consent.
API.setCookie('marketing_consent_given', 'true')
this.state = {
allRequirementsMet: false,
email: '',
first_name: '',
last_name: '',
password: '',
marketing_consent_given: true,
allRequirementsMet: false,
password: '',
}

this.handlePasswordChange = this.handlePasswordChange.bind(this)
Expand Down Expand Up @@ -368,7 +368,7 @@ const HomePage = class extends React.Component {
/>
</span>
<p className='notification__text pl-3'>
Login to accept your invite
Log in to accept your invite
</p>
</div>
)}
Expand Down Expand Up @@ -544,15 +544,30 @@ const HomePage = class extends React.Component {
</FormGroup>
)}
{isInvite && (
<div className='notification flex-row'>
<span className='notification__icon mb-2'>
<IonIcon
icon={informationCircleOutline}
/>
</span>
<p className='notification__text pl-3'>
Create an account to accept your invite
</p>
<div>
<div className='notification flex-row'>
<span className='notification__icon mb-2'>
<IonIcon
icon={informationCircleOutline}
/>
</span>
<p className='notification__text pl-3'>
Create an account to accept your
invite
</p>
</div>
<Row className='justify-content-center'>
Have an account?{' '}
<Button
theme='text'
className='ml-1 fw-bold'
onClick={() => {
window.location.href = `/login${redirect}`
}}
>
Log in
</Button>
</Row>
</div>
)}
<fieldset id='details' className=''>
Expand Down Expand Up @@ -664,18 +679,6 @@ const HomePage = class extends React.Component {
</form>
)}
</Card>
<Row className='justify-content-center'>
Have an account?{' '}
<Button
theme='text'
className='ml-1 fw-bold'
onClick={() => {
window.location.href = `/login${redirect}`
}}
>
Log in
</Button>
</Row>
</React.Fragment>
)}
</div>
Expand Down
Loading