From 1649a703d82fbcd1f91b1603302c2973a44cef78 Mon Sep 17 00:00:00 2001 From: tunny17 Date: Tue, 15 Aug 2023 14:28:51 +0000 Subject: [PATCH] CLASSROOMIO-T-86:Implemented the my learning page Co-authored-by: Ifeanyi Nwosu Merge-request: CLASSROOMIO-MR-42 Merged-by: Best Admin --- src/lib/components/LMS/SideBar.svelte | 11 +- .../LMS/components/AllLearning.svelte | 67 ++++++++++ .../LMS/components/Completed.svelte | 70 +++++++++++ .../LMS/components/InProgress.svelte | 67 ++++++++++ .../components/LMS/components/Learning.svelte | 49 ++++---- .../components/LMS/components/Student.svelte | 13 +- src/lib/components/LMS/components/store.js | 43 ++++++- src/lib/components/Tabs/index.svelte | 74 +++++++----- src/routes/lms/+page.svelte | 114 ++++++++++-------- src/routes/lms/mylearning/+page.svelte | 55 ++++++++- src/routes/lms/reviews/+page.svelte | 1 - src/routes/org/[slug]/+page.svelte | 2 +- static/digital.svg | 10 ++ static/painting.svg | 10 ++ 14 files changed, 459 insertions(+), 127 deletions(-) create mode 100644 src/lib/components/LMS/components/AllLearning.svelte create mode 100644 src/lib/components/LMS/components/Completed.svelte create mode 100644 src/lib/components/LMS/components/InProgress.svelte delete mode 100644 src/routes/lms/reviews/+page.svelte create mode 100644 static/digital.svg create mode 100644 static/painting.svg diff --git a/src/lib/components/LMS/SideBar.svelte b/src/lib/components/LMS/SideBar.svelte index 1e607312..3867fe91 100644 --- a/src/lib/components/LMS/SideBar.svelte +++ b/src/lib/components/LMS/SideBar.svelte @@ -1,11 +1,11 @@ + +
+ {#if mockData.length > 0} +
+ {#each mockData as data} +
+ course + +
+

+ {data.title} +

+

+ {data.description} +

+

By {data.author}

+ + +

{data.lessons} lessons

+ {#if data.inProgress} +
+
+
+
+

{data.progressRate}%

+
+ {/if} + + gotoCourse(data.title)} + /> + +
+
+ {/each} +
+ {:else} + + +

You haven't started any course yet

+

+ Once you start a course, your progress will reflect here +

+
+ {/if} +
diff --git a/src/lib/components/LMS/components/Completed.svelte b/src/lib/components/LMS/components/Completed.svelte new file mode 100644 index 00000000..e503b8da --- /dev/null +++ b/src/lib/components/LMS/components/Completed.svelte @@ -0,0 +1,70 @@ + + +
+ {#if courseCompleted.length > 0} +
+ {#each courseCompleted as data}s +
+
+ course +
+
+

+ {data.title} +

+

+ {data.description} +

+

By {data.author}

+ + +

{data.lessons} lessons

+ {#if data.inProgress} +
+
+
+
+

{data.progressRate}%

+
+ {/if} + + + +
+
+ {/each} +
+ {:else} + + +

No courses completed yet

+

+ Courses you complete will appear here. We believe in you , finish hard 💪🏾. +

+
+ {/if} +
diff --git a/src/lib/components/LMS/components/InProgress.svelte b/src/lib/components/LMS/components/InProgress.svelte new file mode 100644 index 00000000..7078d84d --- /dev/null +++ b/src/lib/components/LMS/components/InProgress.svelte @@ -0,0 +1,67 @@ + + +
+ {#if courseInProgress.length > 0} +
+ {#each courseInProgress as data} +
+ course + +
+

+ {data.title} +

+

+ {data.description} +

+

By {data.author}

+ + +

{data.lessons} lessons

+ {#if data.inProgress} +
+
+
+
+

{data.progressRate}%

+
+ {/if} + + gotoCourse(data.title)} + /> + +
+
+ {/each} +
+ {:else} + + +

No course progress yet

+

+ Once you start a course, your progress will reflect here +

+
+ {/if} +
diff --git a/src/lib/components/LMS/components/Learning.svelte b/src/lib/components/LMS/components/Learning.svelte index ed215b4e..9b43e791 100644 --- a/src/lib/components/LMS/components/Learning.svelte +++ b/src/lib/components/LMS/components/Learning.svelte @@ -1,52 +1,39 @@

Currently Learning

- - {#if courseInProgress === false} -
- -

No courses progress yet

-

Once you start a course, your progress will reflect here

-
- {:else} -
- {#each mockData as data, index} + {#if courseInProgress.length > 0} +
+ {#each courseInProgress as data, index}

{data.title}

-

{data.description}

+

+ {data.description} +

gotoCourse(data.title)} />
@@ -55,6 +42,12 @@
{/each}
+ {:else} +
+ +

No courses progress yet

+

Once you start a course, your progress will reflect here

+
{/if} - +
diff --git a/src/lib/components/LMS/components/Student.svelte b/src/lib/components/LMS/components/Student.svelte index b777a7ee..44e1ba9f 100644 --- a/src/lib/components/LMS/components/Student.svelte +++ b/src/lib/components/LMS/components/Student.svelte @@ -1,7 +1,6 @@ + +
+
+ +

My Learning

+ + + + + + + + + + + + + +
+
diff --git a/src/routes/lms/reviews/+page.svelte b/src/routes/lms/reviews/+page.svelte deleted file mode 100644 index 04e8bb44..00000000 --- a/src/routes/lms/reviews/+page.svelte +++ /dev/null @@ -1 +0,0 @@ -reviews page diff --git a/src/routes/org/[slug]/+page.svelte b/src/routes/org/[slug]/+page.svelte index a4d52668..6286a53f 100644 --- a/src/routes/org/[slug]/+page.svelte +++ b/src/routes/org/[slug]/+page.svelte @@ -207,7 +207,7 @@ {/each} -
+

Your Schedule

diff --git a/static/digital.svg b/static/digital.svg new file mode 100644 index 00000000..a7f4bc1d --- /dev/null +++ b/static/digital.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/static/painting.svg b/static/painting.svg new file mode 100644 index 00000000..a6c8fe67 --- /dev/null +++ b/static/painting.svg @@ -0,0 +1,10 @@ + + + + + + + + + +