Skip to content

Fix/competency data change #13

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
faisalEsMagico merged 1 commit into from
Dec 18, 2023
Merged

Fix/competency data change #13

Show file tree
Hide file tree
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
14 changes: 11 additions & 3 deletions src/app/3cp/marketplace/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,23 @@ import ProfileNavbar from '@/components/wpcasOverView/ProfileNavbar';

import { getAllCourses } from '@/services/marketPlaceServices';

type competencyType = {
[key: string]: string[];
export type LevelsType = {
id: string;
levelNumber: number;
name: string;
};

type CompetencyType = {
id: string;
name: string;
levels: LevelsType[];
};

export type CourseType = {
courseId: string;
title: string;
providerLogo: string;
competency: competencyType;
competency: CompetencyType[];
providerName: string;
author: string;
language: string[];
Expand Down
23 changes: 12 additions & 11 deletions src/components/3cp/Competency.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@ import { CourseType } from '@/app/3cp/marketplace/page';
const Competencies = ({ courseDetails }: { courseDetails: CourseType }) => {
return (
<div className='py-4 '>
{Object.keys(courseDetails?.competency).map((key, index) => {
return (
<SingleCompetency
key={index}
competency={{
name: key,
levels: courseDetails?.competency[key],
}}
/>
);
})}
{courseDetails?.competency?.length > 0 &&
courseDetails?.competency?.map((competency) => {
return (
<SingleCompetency
key={competency?.id}
competency={{
name: competency?.name,
levels: competency?.levels,
}}
/>
);
})}
</div>
);
};
Expand Down
20 changes: 12 additions & 8 deletions src/components/3cp/SingleCompetency.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ import { MdKeyboardArrowDown, MdKeyboardArrowUp } from 'react-icons/md';

import { outfit, poppins } from '@/components/FontFamily';

import { LevelsType } from '@/app/3cp/marketplace/page';

type CompetencyType = {
name: string;
levels: string[];
levels: LevelsType[];
};
const SingleCompetency = ({ competency }: { competency: CompetencyType }) => {
const [open, setOpen] = useState(false);

return (
<div className={`${outfit.className} mb-3 text-[#272728]`}>
<div className=' rounded-lg border p-2'>
Expand All @@ -34,13 +37,14 @@ const SingleCompetency = ({ competency }: { competency: CompetencyType }) => {
</p>
</div>
<ul className='flex flex-col gap-2 pl-2'>
{competency?.levels?.map((level, index) => {
return (
<li key={index} className='flex items-start'>
&bull; {level}
</li>
);
})}
{competency?.levels?.length > 0 &&
competency?.levels?.map((level) => {
return (
<li key={level?.id} className='flex items-start'>
&bull; {level?.name}
</li>
);
})}
</ul>
</div>
)}
Expand Down
18 changes: 11 additions & 7 deletions src/components/3cp/SingleCourse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,17 @@ const SingleCourse = ({
</p>
<div className='pl-6 '>
<ol className='grid list-decimal grid-cols-2 text-[14px] text-[#787878] '>
{Object.keys(course?.competency ?? {})?.map((key) => {
return (
<li key={key}>
{key} ( {course?.competency[key]?.join(', ')} )
</li>
);
})}
{course?.competency?.length > 0 &&
course?.competency?.map((competency) => {
return (
<li key={competency?.id}>
{competency?.name}{' '}
{competency?.levels?.map((level) => {
return `L${level?.levelNumber},`;
})}
</li>
);
})}
</ol>
</div>
</div>
Expand Down