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.

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

Dev #5

Open
wants to merge 49 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
ba9973b
feat(3cp): settlement ui
faisalEsMagico Nov 20, 2023
5daaf60
feat(settlement): create settlement + use wallet page
faisalEsMagico Nov 20, 2023
aa12482
feat(merge): merge dev
faisalEsMagico Nov 21, 2023
2461b4e
fix(loading): change spinner color
faisalEsMagico Nov 21, 2023
cff82fa
feat(marketplace): three section and popup setup
ankitmlesmagico Nov 23, 2023
2ae4871
feat(account section): final touchup
ankitmlesmagico Nov 24, 2023
b3de4ee
feat(account section): final touchup
ankitmlesmagico Nov 24, 2023
863eeeb
Merge pull request #6 from COMPASS-DPG/dev-test
aman1esmagico Nov 24, 2023
913e824
feat(marketplace admin): integration
ankitmlesmagico Nov 25, 2023
a04b3d2
feat(marketplace admin): integration
ankitmlesmagico Nov 25, 2023
5f42745
feat(marketplace admin): merge Settlement
ankitmlesmagico Nov 25, 2023
e75765f
feat(question bank): changed type
ankitmlesmagico Nov 25, 2023
4e251b9
Merge pull request #7 from COMPASS-DPG/dev-test
aman1esmagico Nov 28, 2023
a814504
feat(docker): adding two stage in docker
Nov 28, 2023
0540d6b
feat(userWallet): transectionIntegration
ankitmlesmagico Nov 28, 2023
454a66f
feat(account and course): setting loading and error
ankitmlesmagico Nov 29, 2023
4ad7f13
feat(marktetplace): rest button setup
ankitmlesmagico Dec 1, 2023
ff7f0e7
feat(ui): done with changes
faisalEsMagico Dec 4, 2023
bffa882
feat(marktetplace): merge conflict
ankitmlesmagico Dec 4, 2023
d4f48cb
feat(wpcas): changing the url
Dec 4, 2023
127cfcd
feat(auth): added login and signup
faisalEsMagico Dec 7, 2023
9d4ece1
feat(integration): integration done
faisalEsMagico Dec 8, 2023
ddfb3d0
feat(ui): done with ui changes
faisalEsMagico Dec 10, 2023
8a24f8e
feat(changes): done changes
faisalEsMagico Dec 11, 2023
e7f88a4
feat(changes): done changes
faisalEsMagico Dec 12, 2023
ec34996
feat(fix): remove dashboard
faisalEsMagico Dec 12, 2023
4dfceba
feat(route): change route
faisalEsMagico Dec 12, 2023
2dfa1b4
feat(wallet): done changes in user wallet
faisalEsMagico Dec 12, 2023
4cd51ea
feat(changes): done with changes
faisalEsMagico Dec 12, 2023
c6db1b8
feat(conif): config file for urls
faisalEsMagico Dec 13, 2023
d8bcc29
feat(merge): merge branch
faisalEsMagico Dec 13, 2023
7a7e23d
feat(conflict resolve): backing to dev branch for resolving conflict
Dec 13, 2023
739b677
Merge branch 'dev' into feature/marketplace
aman1esmagico Dec 13, 2023
d0c0e52
Merge pull request #9 from COMPASS-DPG/feature/marketplace
aman1esmagico Dec 13, 2023
e21cee6
feat(yarn): addin new yarn.lock
Dec 13, 2023
26f970b
feat(dockerFile): updating docker config
Dec 13, 2023
212c0ce
feat(build): done changes for build
faisalEsMagico Dec 14, 2023
17c01cb
feat(public url): changing the url
Dec 15, 2023
b6d4805
feat(meta): meta data
faisalEsMagico Dec 15, 2023
cf893e5
Merge branch 'dev' of https://github.com/COMPASS-DPG/wpcas-ui into dev
faisalEsMagico Dec 15, 2023
52f13e1
feat(changes): competency data schema change
faisalEsMagico Dec 18, 2023
caaa2df
Merge pull request #13 from COMPASS-DPG/fix/competencyDataChange
faisalEsMagico Dec 18, 2023
937cd38
feat(fix): align text in login
faisalEsMagico Dec 20, 2023
ed61c1b
fix(dropdown): update with string from id
ankitmlesmagico Apr 5, 2024
286aacd
Merge pull request #14 from COMPASS-DPG/fix/dropdown_issue
VamshiBatta07 Apr 8, 2024
aa7084f
fix(course section): bug fix for competency search
Apr 9, 2024
5aa0a7e
Update .env.example
kh4l1d64 Apr 17, 2024
95eb88a
fix(dropdown): update from competency id to competency name and fixed…
Apr 26, 2024
b1e0938
Merge pull request #15 from COMPASS-DPG/fix/edit-question-bank
kh4l1d64 Apr 26, 2024
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
Prev Previous commit
Next Next commit
feat(changes): competency data schema change
faisalEsMagico committed Dec 18, 2023
commit 52f13e1bdb8d8b236f31d435d04ebc89f3a2c44b
14 changes: 11 additions & 3 deletions src/app/3cp/marketplace/page.tsx
Original file line number Diff line number Diff line change
@@ -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[];
23 changes: 12 additions & 11 deletions src/components/3cp/Competency.tsx
Original file line number Diff line number Diff line change
@@ -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>
);
};
20 changes: 12 additions & 8 deletions src/components/3cp/SingleCompetency.tsx
Original file line number Diff line number Diff line change
@@ -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'>
@@ -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>
)}
18 changes: 11 additions & 7 deletions src/components/3cp/SingleCourse.tsx
Original file line number Diff line number Diff line change
@@ -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>