Skip to content

TCA-979 #499

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 2 commits into from
Feb 17, 2023
Merged

TCA-979 #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f49bcae
TCA-979 cert card complete state
kkartunov Feb 16, 2023
70b9c85
Fix double slash in cert validate URL
kkartunov Feb 16, 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-ts/tools/learn/learn.routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export function getUserTCACertificateUrl(
export function getTCACertificationValidationUrl(
completionUuid: string,
): string {
return `${EnvironmentConfig.TOPCODER_URLS.TCA}/${LEARN_PATHS.root}/${completionUuid}`
return `${EnvironmentConfig.TOPCODER_URLS.TCA}${LEARN_PATHS.root}/${completionUuid}`
}

export function getAuthenticateAndEnrollRoute(): string {
Expand Down
11 changes: 11 additions & 0 deletions src-ts/tools/learn/welcome/tc-certifications/cert-card/TCCertCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@
}
}

.completed {
background: $tc-white;
border: 1px solid $black-20;
}

.separatorBar {
border-bottom: 2px solid $black-10;
margin: $space-lg 0;
Expand All @@ -80,6 +85,12 @@

.cardBottom {
margin-top: $space-lg;

.certCTAButtons {
a:first-child {
margin-right: $space-sm;
}
}
}

.infoText {
Expand Down
23 changes: 19 additions & 4 deletions src-ts/tools/learn/welcome/tc-certifications/cert-card/TCCertCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
TCACertificationProgress,
TCACertificationProviderBase,
} from '../../../learn-lib'
import { getTCACertificationPath } from '../../../learn.routes'
import { getTCACertificateUrl, getTCACertificationPath } from '../../../learn.routes'

import styles from './TCCertCard.module.scss'

Expand Down Expand Up @@ -41,11 +41,22 @@ const TCCertCard: FC<TCCertCardProps> = (props: TCCertCardProps) => {

const isEnrolled: boolean = props.progress?.status === 'enrolled'

const isCompleted: boolean = props.progress?.status === 'completed'

function renderCta(): ReactNode {
if (!isEnrolled) {
if (!isEnrolled && !isCompleted) {
return getCtaBtn('secondary', 'Details', getTCACertificationPath(dashedName))
}

if (isCompleted) {
return (
<div className={styles.certCTAButtons}>
{getCtaBtn('primary', 'View Certificate', getTCACertificateUrl(dashedName))}
{getCtaBtn('secondary', 'Details', getTCACertificationPath(dashedName))}
</div>
)
}

return getCtaBtn('primary', 'Resume', getTCACertificationPath(dashedName))
}

Expand All @@ -62,7 +73,7 @@ const TCCertCard: FC<TCCertCardProps> = (props: TCCertCardProps) => {
}

return (
<div className={styles.wrap}>
<div className={classNames(styles.wrap, isCompleted && styles.completed)}>
<div className={styles.cardHeader}>
<CertificateBadgeIcon
type={props.certification.certificationCategory.track}
Expand Down Expand Up @@ -130,7 +141,11 @@ const TCCertCard: FC<TCCertCardProps> = (props: TCCertCardProps) => {
{props.certification.description.length > EXCERPT_TEXT_LEN ? '...' : ''}
</p>

<SkillTags skills={skills} courseKey={dashedName} />
<SkillTags
skills={skills}
courseKey={dashedName}
theme={isCompleted ? 'gray' : 'white'}
/>

<ProvidersLogoList
className={styles.providers}
Expand Down