Skip to content

New onboarding look and feel minor issue #714

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

Merged
merged 3 commits into from
Jul 9, 2023
Merged

New onboarding look and feel minor issue #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b54573b
update onboarding ui
suppermancool Jul 9, 2023
e47ec60
onboarding fix wrong text
suppermancool Jul 9, 2023
954d22e
onboarding: fix final step link
suppermancool Jul 9, 2023
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
2 changes: 1 addition & 1 deletion src/apps/onboarding/src/components/FormField/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $green1: #137d60;
display: flex;
flex-direction: column;
justify-content: flex-start;
margin-bottom: 18px;
margin-bottom: 0;

.form-field {
border: 1px solid #b7b7b7;
Expand Down
5 changes: 5 additions & 0 deletions src/apps/onboarding/src/components/modal-add-education/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
}
}

:global(.modal-body) {
padding-bottom: 0;
margin-bottom: 0;
}

hr {
margin-top: 30px;
}
Expand Down
24 changes: 13 additions & 11 deletions src/apps/onboarding/src/components/modal-add-work/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,17 +223,19 @@ const ModalAddWork: FC<ModalAddWorkProps> = (props: ModalAddWorkProps) => {
</FormField>
</div>
</div>
<FormInputCheckboxMiddleware
label='I am currently working in this role'
checked={workInfo.currentlyWorking}
inline
onChange={(e: any) => {
setWorkInfo({
...workInfo,
currentlyWorking: e.target.checked,
})
}}
/>
<div className='mt-16'>
<FormInputCheckboxMiddleware
label='I am currently working in this role'
checked={workInfo.currentlyWorking}
inline
onChange={(e: any) => {
setWorkInfo({
...workInfo,
currentlyWorking: e.target.checked,
})
}}
/>
</div>
</div>
</BaseModal>
)
Expand Down
2 changes: 1 addition & 1 deletion src/apps/onboarding/src/pages/educations/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const PageEducationsContent: FC<{

return (
<div className={classNames('d-flex flex-column', styles.container)}>
<h2>Add your education information</h2>
<h2>Education</h2>
<PageDivider />

<div className={classNames('d-flex flex-column align-items-start full-width mt-8', styles.blockContent)}>
Expand Down
13 changes: 10 additions & 3 deletions src/apps/onboarding/src/pages/personalization/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { FC, MutableRefObject, useEffect, useRef } from 'react'
import classNames from 'classnames'

import { Button, PageDivider } from '~/libs/ui'
import { EnvironmentConfig } from '~/config'

import { ProgressBar } from '../../components/progress-bar'
import styles from './styles.module.scss'
Expand Down Expand Up @@ -54,7 +55,11 @@ const PagePersonalizationContent: FC<{

useEffect(() => {
if (!loading && !shouldSavingData.current && !!shouldNavigateTo.current) {
navigate(shouldNavigateTo.current)
if (shouldNavigateTo.current.startsWith('../')) {
navigate(shouldNavigateTo.current)
} else {
window.location.href = shouldNavigateTo.current
}
}
/* eslint-disable react-hooks/exhaustive-deps */
}, [loading])
Expand Down Expand Up @@ -131,9 +136,11 @@ const PagePersonalizationContent: FC<{
iconToLeft
onClick={() => {
if (loading) {
shouldNavigateTo.current = '../account-details'
shouldNavigateTo.current
= `${EnvironmentConfig.USER_PROFILE_URL}/${props.memberInfo?.handle}`
} else {
navigate('../account-details')
window.location.href
= `${EnvironmentConfig.USER_PROFILE_URL}/${props.memberInfo?.handle}`
}
}}
>
Expand Down