Skip to content

TCA-176 - add loading spinner on my-learnings page #254

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
Aug 5, 2022
Merged

TCA-176 - add loading spinner on my-learnings page #254

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
ace2bb0
TCA-176 - add loading spinner on my-learnings page
vas3a Aug 4, 2022
a1a20ea
lint fixes
vas3a Aug 4, 2022
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
10 changes: 10 additions & 0 deletions src-ts/tools/learn/my-learning/MyLearning.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@import '../../../lib/styles/includes';

.wrap {
flex: 1 1 auto;
position: relative;
}

.content-layout {
background: $black-5;
}
Expand Down Expand Up @@ -34,6 +39,7 @@
gap: $pad-lg;
display: flex;
flex-direction: column;
position: relative;
&:empty {
display: none;
}
Expand All @@ -57,4 +63,8 @@
flex: 1 1 0;
}
}
}

.loading-spinner {
background: none;
}
66 changes: 37 additions & 29 deletions src-ts/tools/learn/my-learning/MyLearning.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC, useContext, useMemo } from 'react'

import { Breadcrumb, BreadcrumbItemModel, ContentLayout, Portal, profileContext, ProfileContextData } from '../../../lib'
import { Breadcrumb, BreadcrumbItemModel, ContentLayout, LoadingSpinner, Portal, profileContext, ProfileContextData } from '../../../lib'
import {
AllCertificationsProviderData,
LearnCertification,
Expand All @@ -24,9 +24,11 @@ interface CertificatesByIdType {

const MyLearning: FC<{}> = () => {

const { profile }: ProfileContextData = useContext(profileContext)
const { completed, inProgress }: UserCertificationsProviderData = useUserCertifications()
const { certifications }: AllCertificationsProviderData = useAllCertifications()
const { profile, initialized: profileReady }: ProfileContextData = useContext(profileContext)
const { completed, inProgress, ready: coursesReady }: UserCertificationsProviderData = useUserCertifications()
const { certifications, ready: certificatesReady }: AllCertificationsProviderData = useAllCertifications()

const ready: boolean = profileReady && coursesReady && certificatesReady

const certificatesById: CertificatesByIdType = useMemo(() => (
certifications.reduce((certifs, certificate) => {
Expand All @@ -46,6 +48,8 @@ const MyLearning: FC<{}> = () => {
<ContentLayout contentClass={styles['content-layout']}>
<Breadcrumb items={breadcrumb} />
<div className={styles['wrap']}>
<LoadingSpinner hide={ready} className={styles['loading-spinner']} />

<Portal portalId='page-subheader-portal-el'>
<div className={styles['hero-wrap']}>
<WaveHero
Expand All @@ -60,36 +64,40 @@ const MyLearning: FC<{}> = () => {
</div>
</Portal>

<div className={styles['courses-area']}>
{inProgress.map((certif) => (
<MyCourseInProgressCard
certification={certificatesById[certif.certificationId]}
key={certif.certificationId}
theme='detailed'
currentLesson={certif.currentLesson}
completedPercentage={certif.courseProgressPercentage / 100}
startDate={certif.startDate}
/>
))}
</div>

{!!completed.length && (
<div className={styles['courses-area']}>
<div className={styles['title-line']}>
<LearningHat />
<h2 className='details'>Completed Courses</h2>
</div>

<div className={styles['cards-wrap']}>
{completed.map((certif) => (
<MyCourseCompletedCard
{ready && (
<>
<div className={styles['courses-area']}>
{inProgress.map((certif) => (
<MyCourseInProgressCard
certification={certificatesById[certif.certificationId]}
key={certif.certificationId}
completed={certif.completedDate}
theme='detailed'
currentLesson={certif.currentLesson}
completedPercentage={certif.courseProgressPercentage / 100}
startDate={certif.startDate}
/>
))}
</div>
</div>

{!!completed.length && (
<div className={styles['courses-area']}>
<div className={styles['title-line']}>
<LearningHat />
<h2 className='details'>Completed Courses</h2>
</div>

<div className={styles['cards-wrap']}>
{completed.map((certif) => (
<MyCourseCompletedCard
certification={certificatesById[certif.certificationId]}
key={certif.certificationId}
completed={certif.completedDate}
/>
))}
</div>
</div>
)}
</>
)}
</div>
</ContentLayout>
Expand Down