Compare commits

...

694 Commits

Author SHA1 Message Date
Hussain Nagaria d9bf4e2c58 fix: title and tab copy 2024-04-16 14:42:17 +05:30
Jannat Patel 78698cfcbe Merge pull request #773 from pateljannat/youtube-issues
fix: lesson youtube video issue
2024-04-15 13:33:03 +05:30
Jannat Patel 64c02f14a9 fix: removed quiz_id from the lesson content 2024-04-15 13:29:50 +05:30
Jannat Patel 2f68fc0d6e fix: quiz rerender issue 2024-04-15 13:27:38 +05:30
Jannat Patel 16570469e6 fix: lesson youtube video issue 2024-04-15 12:35:27 +05:30
Md Hussain Nagaria a62b754d28 fix: empty the container before editorjs init (#771) 2024-04-12 13:52:43 +05:30
Jannat Patel 93859d6635 Merge pull request #769 from pateljannat/fixes-lesson
fix: check site conf before sending email
2024-04-10 21:23:15 +05:30
Jannat Patel 20fab8dbd3 fix: check site conf before sending email 2024-04-10 19:38:30 +05:30
Md Hussain Nagaria 13536aac51 fix: primary page title (#767) 2024-04-09 15:33:10 +05:30
Jannat Patel ccb8721674 fix: evaluation modal 2024-04-06 11:19:49 +05:30
Jannat Patel fbe1423edd fix: meta for batches 2024-04-06 11:17:25 +05:30
Jannat Patel d2713d7824 Merge pull request #763 from pateljannat/slots-message
fix: no slots message
2024-04-06 11:03:26 +05:30
Jannat Patel f24a15b4f8 fix: no slots message 2024-04-06 10:55:50 +05:30
Jannat Patel bf74868bd4 Merge pull request #762 from pateljannat/assignments
feat: assignments in batches
2024-04-05 22:51:39 +05:30
Jannat Patel 6d75b8a3a2 feat: assignments in batches 2024-04-05 21:51:18 +05:30
Jannat Patel 055f917c61 Merge pull request #761 from pateljannat/rewrite-fixes
fix: mobile layout and certification link
2024-04-05 08:59:38 +05:30
Jannat Patel d892a28069 fix: mobile layout and certification link 2024-04-05 08:56:18 +05:30
Jannat Patel 838bc1fac2 Merge pull request #760 from pateljannat/fix-templates
fix: web templates
2024-04-04 15:41:14 +05:30
Jannat Patel a98d36513b fix: web templates 2024-04-04 15:01:22 +05:30
Jannat Patel 2cfa6771ac fix: lesson page issue 2024-04-04 11:24:44 +05:30
Jannat Patel 4960c47377 Merge pull request #758 from pateljannat/branding
fix: branding, course, lesson and certificate creation
2024-04-04 10:31:13 +05:30
Jannat Patel a46306720b fix: branding, course, lesson and certificate creation 2024-04-03 22:42:59 +05:30
Jannat Patel efcdba3a29 Merge pull request #713 from pateljannat/lms-frappe-ui
feat: LMS rewrite in Frappe UI
2024-04-03 12:22:03 +05:30
Jannat Patel e7263d0566 style: removed print statement 2024-04-03 12:14:51 +05:30
Jannat Patel 5de7f5e283 fix: progress 2024-04-03 12:11:34 +05:30
Jannat Patel c7bdf68bc6 bump: frappe-ui 2024-04-02 14:07:52 +05:30
Jannat Patel 998ff51c58 chore: removed print statements 2024-04-01 22:34:59 +05:30
Jannat Patel 4eb9d84d8b chore: fixed semgrep 2024-04-01 22:29:24 +05:30
Jannat Patel 5f000d8017 style: linters for vue files 2024-04-01 22:01:55 +05:30
Jannat Patel 0cf9ad5228 chore: resolved conflicts 2024-04-01 21:54:01 +05:30
Jannat Patel 71a526e7aa fix: dummy text to make content words greater than 250 2024-04-01 18:38:31 +05:30
Jannat Patel c5d9adb7fd fix: added paragraph for description and a link for seo 2024-04-01 17:47:34 +05:30
Jannat Patel 05fdf163a9 fix: certificate website link 2024-04-01 17:27:12 +05:30
Jannat Patel de0a983033 fix: replaced h2 with h1 for flash text 2024-03-29 22:44:17 +05:30
Jannat Patel 44ee9b644f fix: flash text for seo 2024-03-29 22:29:24 +05:30
Jannat Patel bd116c3e7b feat: meta for batches 2024-03-29 14:48:46 +05:30
Jannat Patel 02e8a97f85 chore: post install scripts 2024-03-28 17:20:39 +05:30
Jannat Patel 3525e4c90b feat: meta tags 2024-03-28 16:20:53 +05:30
Jannat Patel e6d3819092 feat: mobile responsive 2024-03-28 11:30:59 +05:30
Jannat Patel f15862cef4 fix: router 2024-03-19 12:51:11 +05:30
Jannat Patel 86748b301d feat: page titles 2024-03-19 12:04:58 +05:30
Jannat Patel cc07dd849c feat: job creation 2024-03-18 16:55:36 +05:30
Jannat Patel 63bcbb6506 feat: batch creation 2024-03-15 21:54:02 +05:30
Jannat Patel 83a1b03bb7 feat: quiz plugin in lesson 2024-03-11 09:38:27 +05:30
Jannat Patel 2905a6af1a Merge pull request #749 from pateljannat/batch-conditions
fix: batch registration button conditions
2024-03-07 10:33:39 +05:30
Jannat Patel 4cc27adb8b fix: batch registration button conditions 2024-03-07 10:21:18 +05:30
Jannat Patel 2126b4f657 fix: lesson editing 2024-03-07 10:06:32 +05:30
Jannat Patel 0ce7c74778 feat: lesson creation 2024-03-05 23:07:58 +05:30
Jannat Patel b9f6a23412 chore: build files 2024-03-04 22:12:21 +05:30
Jannat Patel 9ae96bd1fa feat: chapter creation 2024-03-04 22:10:51 +05:30
Jannat Patel e863abe37c fix: structure of ourline creation 2024-03-01 13:50:00 +05:30
Jannat Patel 80e9984db0 feat: course creation resources 2024-03-01 10:57:31 +05:30
Jannat Patel 8f504a8043 fix: course creation form validations 2024-02-28 23:42:17 +05:30
Jannat Patel 60a917e60c feat: course creation page structure 2024-02-27 20:41:02 +05:30
Jannat Patel a5d000f702 fix: quix show correct answers 2024-02-21 17:02:18 +05:30
Jannat Patel 5317aa8fb5 feat: job application 2024-02-21 12:08:05 +05:30
Jannat Patel 39aa1d443d fix: removed unnecessary start learning buttons 2024-02-19 17:07:22 +05:30
Jannat Patel 36c4e2f4dc feat: job application modal 2024-02-19 16:54:07 +05:30
Jannat Patel 084eeba2ed Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2024-02-07 12:25:37 +05:30
Jannat Patel 4b4086afb3 fix: active site capture 2024-02-07 11:14:12 +05:30
Jannat Patel 6401497422 feat: job details 2024-02-07 10:57:05 +05:30
Jannat Patel 684601f31b Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2024-02-07 10:55:50 +05:30
Jannat Patel d7d222842b feat: statistics graphs 2024-02-06 22:39:08 +05:30
Jannat Patel b0bb7d32ca chore: capture active sites 2024-02-06 10:12:49 +05:30
Jannat Patel ff1bd91223 feat: cohort description 2024-02-05 23:06:26 +05:30
Jannat Patel f59f6c617a fix: cleanup ui 2024-02-05 17:36:55 +05:30
Jannat Patel af48ccfb57 fix: cleanup ui 2024-02-05 17:35:46 +05:30
Jannat Patel 4b9d3bd996 fix: minor ui 2024-02-01 15:03:50 +05:30
Jannat Patel 3dad3580bb fix: batch self enrollment 2024-02-01 10:52:23 +05:30
Jannat Patel 53eb95612c fix: review button 2024-02-01 10:48:05 +05:30
Jannat Patel 8f687145be fix: pricing issue 2024-01-25 23:13:43 +05:30
Jannat Patel 9c405edd09 Merge branch 'main' of https://github.com/frappe/lms 2024-01-25 15:45:41 +05:30
Jannat Patel fe791dc478 fix: batch self enrollment 2024-01-25 15:45:27 +05:30
Jannat Patel 8f317d2f44 fix: ui issues 2024-01-25 15:24:52 +05:30
Jannat Patel f4e581f6cb fix: multicurrency on course cards 2024-01-23 17:03:15 +05:30
Jannat Patel 9671c4d63f feat: batch billing 2024-01-23 15:33:31 +05:30
Jannat Patel 42417621fa Merge pull request #712 from IslemMedjahdi/patch-1
Update docker-installation.md
2024-01-23 13:30:10 +05:30
Jannat Patel d3b3d85c84 fix: redirect to login if guest before batch enrollment 2024-01-22 11:19:32 +05:30
Md Hussain Nagaria b700013704 fix: only show start date for single day batches (#726) 2024-01-22 10:55:36 +05:30
Jannat Patel bac229c731 Merge pull request #725 from pateljannat/students-in-batch
feat: self enrolment in batches
2024-01-22 10:54:20 +05:30
Jannat Patel 28043e634b fix: removed unnecessary roles 2024-01-22 10:43:02 +05:30
Md Hussain Nagaria b672108155 fix: remove $ typos (#723) 2024-01-22 10:33:55 +05:30
Jannat Patel 5e569ab0e6 feat: self enrollment in batches 2024-01-19 23:56:48 +05:30
Jannat Patel b07940951c feat: billing page 2024-01-19 22:48:38 +05:30
Jannat Patel 1f18ef4362 feat: discussions in batches 2024-01-19 17:44:47 +05:30
Jannat Patel bf57a19e2c Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2024-01-18 14:44:20 +05:30
Jannat Patel 43a07e53a6 Merge branch 'main' of https://github.com/frappe/lms 2024-01-18 11:32:12 +05:30
Jannat Patel fbd83196fc fix: job page logos 2024-01-18 11:31:50 +05:30
Jannat Patel 465f4e1e96 docs: fixed readme logo dimensions 2024-01-17 14:48:48 +05:30
Jannat Patel 43d409ce64 Merge branch 'main' of https://github.com/frappe/lms 2024-01-17 14:47:11 +05:30
Jannat Patel a5fc52ec29 fix: logo on readme 2024-01-17 14:46:48 +05:30
Jannat Patel a9b06575d0 Merge pull request #718 from pateljannat/change-jobs-route
fix: changed jobs route to job-openings
2024-01-17 11:24:06 +05:30
Jannat Patel 3070cbed3c fix: changed jobs route to job-openings 2024-01-17 11:00:31 +05:30
Jannat Patel 0845a6e2a3 feat: statistics page numbers 2024-01-17 10:35:34 +05:30
Jannat Patel 041bae16e0 feat: discussions new topic 2024-01-16 20:49:07 +05:30
Jannat Patel 3313db844c feat: discussions edit and delete 2024-01-16 17:24:35 +05:30
Jannat Patel 3a5977a718 feat: discussions 2024-01-15 23:26:31 +05:30
Jannat Patel bcee74ce77 feat: batch announcements 2024-01-12 21:48:42 +05:30
Jannat Patel 1a6a119f35 feat: students and assessment tab in dashboard 2024-01-10 21:36:02 +05:30
Jannat Patel 09ae61492f feat: upcoming evals 2024-01-08 16:17:50 +05:30
Jannat Patel 3a33f047f5 feat: batch details 2024-01-05 18:22:03 +05:30
Jannat Patel 10cdd712d2 feat: batch card price and seat count 2024-01-02 12:39:28 +05:30
Jannat Patel 21959eef7b feat: quiz submission history table 2024-01-02 11:00:12 +05:30
Jannat Patel 41c3522285 feat: quiz submission 2024-01-01 23:26:53 +05:30
Medjahdi Islem d712881e16 Update docker-installation.md 2024-01-01 15:32:00 +01:00
Jannat Patel 991dc7f8c8 fix: batch card 2023-12-28 12:04:06 +05:30
Jannat Patel 7087fde686 feat: quiz base 2023-12-28 11:59:44 +05:30
Jannat Patel 6b6c8da785 Merge pull request #706 from pateljannat/evaluation-request-validations
fix: evaluation dates validation
2023-12-22 22:54:23 +05:30
Jannat Patel e1d61c9eb9 feat: review submission 2023-12-21 17:25:08 +05:30
Jannat Patel afcb15148f chore: merged conflicts 2023-12-21 14:59:30 +05:30
Jannat Patel f40fbaed3e fix: check country from ip for multicurrency 2023-12-21 14:22:58 +05:30
Jannat Patel 5adb36deaf Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-12-21 14:05:59 +05:30
Jannat Patel 4973386dd0 Merge pull request #710 from pateljannat/usd-pricing
feat: usd pricing
2023-12-21 12:58:06 +05:30
Jannat Patel 13536b8bad feat: usd pricing 2023-12-21 12:28:11 +05:30
Jannat Patel caea7e334c Merge pull request #707 from pateljannat/batch-meta-image
fix: batch meta image saving
2023-12-21 09:56:50 +05:30
Jannat Patel 4065b1b8cc feat: review modal 2023-12-21 09:56:15 +05:30
Jannat Patel b248774774 Merge pull request #708 from pateljannat/confirmation-email
fix: copy of enrolment email
2023-12-20 12:16:03 +05:30
Jannat Patel 7a9d6325d5 fix: copy of enrollment email 2023-12-20 11:49:32 +05:30
Jannat Patel b0d0b41502 fix: batch meta image saving 2023-12-20 11:37:54 +05:30
Jannat Patel 30c89cb13c fix: evaluation dates validation 2023-12-20 11:00:09 +05:30
Jannat Patel eb3afbbad1 feat: rating component 2023-12-20 10:35:12 +05:30
Jannat Patel 9175737b9c Merge pull request #705 from pateljannat/email-address-assignment-issue
fix: assignment issue
2023-12-19 11:49:53 +05:30
Jannat Patel 7ae772205a Merge pull request #704 from pateljannat/evaluation-fields
fix: evaluation fields
2023-12-19 11:15:32 +05:30
Jannat Patel 00b0a20c83 fix: translations 2023-12-19 10:54:56 +05:30
Jannat Patel 6604866342 fix: assignment issue 2023-12-19 10:51:36 +05:30
Jannat Patel 881c3d943a fix: evaluation fields 2023-12-18 20:06:43 +05:30
Jannat Patel fbe219a888 feat: lesson pagination 2023-12-18 19:17:44 +05:30
Jannat Patel 5928b8e5f9 feat: lesson pagination 2023-12-18 19:17:17 +05:30
Jannat Patel 372425bed2 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-12-18 11:31:35 +05:30
Jannat Patel d2922fd361 feat: lesson page 2023-12-15 23:39:15 +05:30
Jannat Patel d5118cc91f fix: razorpay payment in other currency 2023-12-14 16:08:07 +05:30
Jannat Patel ac74cbdf72 fix: razorpay payment in other currency 2023-12-14 15:53:07 +05:30
Jannat Patel 01f7fc3cff fix: razorpay payment in other currency 2023-12-14 15:12:23 +05:30
Jannat Patel 85c850e5bf fix: cohorts 2023-12-14 15:08:42 +05:30
Jannat Patel e7b6001e5f fix: logout issue 2023-12-14 14:32:50 +05:30
Jannat Patel 4053984ca2 fix: courses cahce 2023-12-13 11:57:25 +05:30
Jannat Patel a1e06bf316 fix: courses cahce 2023-12-13 11:57:18 +05:30
Jannat Patel 67dfffdd58 fix: calendar day view range 2023-12-13 10:41:15 +05:30
Jannat Patel c50f2147fd feat: course details page design 2023-12-13 10:33:34 +05:30
Jannat Patel d4671fb888 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-12-12 14:58:45 +05:30
Jannat Patel ae4aadb8d3 Merge pull request #702 from pateljannat/timetable-mobile-view
feat: day view for timetable on mobile
2023-12-12 12:15:02 +05:30
Jannat Patel e5dc2bad6a feat: day view for timetable on mobile 2023-12-12 12:00:24 +05:30
Jannat Patel 77cda10419 feat: course details page 2023-12-12 10:19:52 +05:30
Jannat Patel 6de879cd2a fix: translations 2023-12-08 19:12:59 +05:30
Jannat Patel 0e2fabf139 Merge pull request #700 from pateljannat/fix-milestones
fix: future date access on timetables for moderators
2023-12-08 16:06:38 +05:30
Jannat Patel c45a372e83 fix: future date access on timetables for moderators 2023-12-08 15:27:33 +05:30
Jannat Patel 25f24b98c6 feat: fetch translations 2023-12-08 15:04:41 +05:30
Jannat Patel 98ecb4c27c Merge pull request #699 from pateljannat/all-day-events-style
fix: All day events style
2023-12-07 17:37:44 +05:30
Jannat Patel 9023094326 fix: timetable style 2023-12-07 16:00:11 +05:30
Jannat Patel 497de05db2 fix: all day events style 2023-12-07 15:53:10 +05:30
Jannat Patel 11079dae00 feat: translations 2023-12-07 11:38:12 +05:30
Jannat Patel d00da31f84 feat: course list 2023-12-05 22:39:00 +05:30
Jannat Patel 644fb698d8 chore: fixed config 2023-11-30 16:03:06 +05:30
Jannat Patel 92edb3a1bf Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-11-30 12:15:39 +05:30
Jannat Patel cb3224664e Merge pull request #695 from pateljannat/all-day-events
feat: all day events
2023-11-30 12:12:09 +05:30
Jannat Patel 9b532a5470 fix: editing evaluation end date from lms portal 2023-11-30 12:02:43 +05:30
Jannat Patel f1f9d9790b feat: all day events 2023-11-30 11:51:36 +05:30
Jannat Patel 96190910a7 Merge pull request #694 from pateljannat/evaluation-end-date
feat: evaluation end date
2023-11-29 22:58:53 +05:30
Jannat Patel 6484763d37 fix: removed additional roles 2023-11-29 22:32:52 +05:30
Jannat Patel 0e2feac81e fix: frappe-ui setup 2023-11-29 22:28:38 +05:30
Jannat Patel 6f1e7624ec feat:evaluation end date from lms portal 2023-11-29 18:01:44 +05:30
Jannat Patel eef5bd6062 feat: evaluation end date 2023-11-29 17:36:34 +05:30
Jannat Patel 63bcf15900 feat: course cards 2023-11-29 12:05:40 +05:30
Jannat Patel 25bcd10e93 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-11-28 11:20:52 +05:30
Md Hussain Nagaria de60fbb25a fix(LMS Batch): add portal web link to form view (#692) 2023-11-27 22:19:07 +05:30
Jannat Patel fd9a638879 fix: quiz and timetable issues 2023-11-24 12:37:34 +05:30
Jannat Patel ddcb718a3a fix: quiz submission questions 2023-11-23 11:50:22 +05:30
Jannat Patel a17a7453e7 fix: ceil the percentage 2023-11-22 17:49:47 +05:30
Jannat Patel 479be0b8ee Merge pull request #681 from pateljannat/notify-mentions
feat: misc changes
2023-11-22 17:34:44 +05:30
Jannat Patel 6f40c357b3 fix: quiz submission page rendering 2023-11-22 17:27:42 +05:30
Jannat Patel 81db6c544d fix: mention email link 2023-11-22 13:04:04 +05:30
Jannat Patel be4e3aa963 Merge pull request #682 from pateljannat/course-creation-error
fix: course creation issue
2023-11-21 14:38:27 +05:30
Jannat Patel 6da0c07a3d fix: course creation issue 2023-11-21 14:13:11 +05:30
Jannat Patel b4ad10ca35 Merge pull request #680 from pateljannat/lesson-creation-issue
fix: encode chapter during lesson creation
2023-11-21 13:46:07 +05:30
Jannat Patel 2388b878dc fix: encode chapter during lesson creation 2023-11-21 13:35:47 +05:30
Jannat Patel 8cdaa7877a feat: discussions mention notifications 2023-11-21 13:32:12 +05:30
Jannat Patel d314287883 Merge pull request #679 from pateljannat/upcoming-batch
fix: upcoming batches based on start time
2023-11-17 11:00:07 +05:30
Jannat Patel b70dfc8e82 fix: upcoming batches based on start time 2023-11-17 10:45:29 +05:30
Jannat Patel 0a784766b4 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-11-09 16:16:08 +05:30
Jannat Patel a5a7184f9a Merge pull request #676 from pateljannat/pyproject
build: added pyproject.toml
2023-11-09 15:54:12 +05:30
Jannat Patel 4e019d0a43 Merge pull request #677 from pateljannat/get-certificate-issue
fix: get certificate button visibility
2023-11-09 15:50:35 +05:30
Jannat Patel 8453b54360 fix: syntax of pyproject 2023-11-09 15:46:51 +05:30
Jannat Patel 9f9dfdb26d fix: get certificate button visibility 2023-11-09 15:27:46 +05:30
Jannat Patel 9fd4984247 fix: get certificate button visibility 2023-11-09 15:22:05 +05:30
Jannat Patel 9ebd64f47d build: added pyproject.toml 2023-11-09 15:18:06 +05:30
Jannat Patel 4316a37ed6 Merge pull request #675 from pateljannat/certificate-fix
fix: certificates in profile
2023-11-09 12:58:47 +05:30
Jannat Patel 2d745460e8 fix: certificates in profile 2023-11-09 12:29:23 +05:30
Jannat Patel b5258b6d9f Merge pull request #674 from pateljannat/assignment-fix
fix: assignment submission email
2023-11-07 12:05:21 +05:30
Jannat Patel 41b076c0db fix: user type filter on assignment submission 2023-11-07 11:42:31 +05:30
Jannat Patel 9d65e5e398 Merge pull request #673 from rtdany10/total-mark-issue
fix: mandatory total marks issue
2023-11-07 11:41:34 +05:30
Jannat Patel 7250bf7d65 fix: changed recipient in assignment submission email 2023-11-07 11:32:26 +05:30
Jannat Patel 4d7b247378 fix: assignment submission email 2023-11-07 11:31:58 +05:30
Dany Robert 0aaa58cd54 fix: mandatory total marks issue 2023-11-07 04:48:32 +00:00
Jannat Patel 014b85f12c Merge pull request #672 from pateljannat/user-category-default
fix: default user category
2023-11-06 19:14:19 +05:30
Jannat Patel 929f97cb72 test: skip invite email if in test 2023-11-06 19:08:30 +05:30
Jannat Patel de9cb935ee test: skip certificate email if in test 2023-11-06 18:58:12 +05:30
Jannat Patel 9aafc176e4 fix: default user category 2023-11-06 18:39:52 +05:30
Jannat Patel 0488ae8305 Merge pull request #670 from pateljannat/cert-fixes
fix: certificate border and email
2023-11-02 12:29:55 +05:30
Jannat Patel 60fd317d98 feat: certification email 2023-11-02 12:20:11 +05:30
Jannat Patel e54435d85d fix: certificate border 2023-11-01 18:27:17 +05:30
Jannat Patel 3a23b91c90 Merge pull request #669 from pateljannat/batch-tabs-customisation
feat: batch tabs settings
2023-10-30 18:42:56 +05:30
Jannat Patel 69591577bf feat: batch tabs settings 2023-10-30 18:30:58 +05:30
Jannat Patel e56afba6d3 Merge pull request #645 from tundebabzy/644
fix: 10th lesson access issue
2023-10-27 18:45:00 +05:30
Jannat Patel 98536ce4c7 Merge pull request #668 from frappe/pateljannat-security-md
chore: created security policy
2023-10-27 18:36:39 +05:30
Jannat Patel 05282178dd fix: removed functional programing code 2023-10-27 18:30:45 +05:30
Jannat Patel 1af547288c chore: fix linters 2023-10-27 17:53:35 +05:30
Jannat Patel b4af82acbc chore: fix linters 2023-10-27 17:21:28 +05:30
Jannat Patel 50fbe00d23 Merge pull request #667 from pateljannat/batch-ic
fix: misc batch issues
2023-10-27 17:18:20 +05:30
Jannat Patel b44428677e chore: created security policy 2023-10-27 17:17:10 +05:30
Tunde Akinyanmi d67faa1610 forgot to remove the LessonBookmark class 2023-10-27 12:05:37 +01:00
Tunde Akinyanmi 7b3f4c29d8 remove LessonBookmark abstraction. 2023-10-27 12:00:44 +01:00
Jannat Patel a49871c5b1 fix: misc batch issues 2023-10-27 16:04:03 +05:30
Jannat Patel e4005792af Merge pull request #665 from saadchaudharry/main
Fix:timetable validation
2023-10-27 12:04:36 +05:30
saadindictrans 8c0c09a21b Fix:timetable validation 2023-10-27 11:33:18 +05:30
Jannat Patel a9b05f4256 Merge pull request #662 from pateljannat/batch-source
feat: batch source
2023-10-26 20:35:57 +05:30
Jannat Patel cb6013a7a6 fix: source doctype name during install 2023-10-26 18:09:05 +05:30
Jannat Patel bb23b78a4f fix: made source mandatory in billing form 2023-10-26 18:00:11 +05:30
Jannat Patel 243277012f feat: batch source 2023-10-26 17:51:43 +05:30
Jannat Patel c9ed8a4b03 Merge pull request #661 from pateljannat/fix-eval-slot
fix: evaluation slots
2023-10-26 15:25:55 +05:30
Jannat Patel d413acaef3 fix: evaluation slots 2023-10-26 15:14:35 +05:30
Jannat Patel d6aad6cd74 Merge branch 'main' into 644 2023-10-26 14:45:56 +05:30
Jannat Patel ca45e43003 Merge pull request #658 from pateljannat/certification-fix
fix: certificate download template
2023-10-26 12:52:14 +05:30
Jannat Patel ad39530705 fix: certificate download template 2023-10-26 11:30:26 +05:30
Jannat Patel a6c2378b56 fix: certificate template pathc 2023-10-25 14:25:42 +05:30
Jannat Patel c073d2201d Merge pull request #657 from pateljannat/course-certificates
feat: certificate template
2023-10-25 14:15:54 +05:30
Jannat Patel 6d70de2eb1 feat: certificate template 2023-10-25 13:08:56 +05:30
Jannat Patel 48982e8f4a Merge pull request #655 from pateljannat/append-student-email
fix: Append student email to batch
2023-10-25 11:47:54 +05:30
Jannat Patel 397128f980 chore: merged conflicts 2023-10-25 11:36:07 +05:30
Jannat Patel 1d77fd3f94 Merge pull request #654 from pateljannat/timetable-milestones
feat: timetable milestones
2023-10-25 11:28:56 +05:30
Jannat Patel 60e78e8e74 feat: emails tab 2023-10-23 20:12:48 +05:30
Jannat Patel 4a9ccc6fde fix: cc in student email 2023-10-23 19:14:59 +05:30
Jannat Patel a707095fae fix: link student emails to batch 2023-10-23 19:11:36 +05:30
Jannat Patel d4f662f65e feat: timetable milestones 2023-10-23 16:35:35 +05:30
Jannat Patel 509b1365d9 Merge pull request #646 from pateljannat/quiz-refactor
feat: Quiz Refactor
2023-10-20 11:31:31 +05:30
Jannat Patel d0b236e381 fix: translations 2023-10-20 11:08:10 +05:30
Jannat Patel fe98265636 test: fix quiz tests 2023-10-20 10:56:47 +05:30
Jannat Patel 3f7d1b1e83 feat: add questions from LMS Portal 2023-10-19 22:15:30 +05:30
Jannat Patel 52cde329c1 Merge branch 'quiz-refactor' of https://github.com/pateljannat/lms into quiz-refactor 2023-10-18 23:21:57 +05:30
Jannat Patel 68b2dd6147 feat: quiz question from UI 2023-10-18 23:21:49 +05:30
Jannat Patel 5fa0d022dc Merge branch 'main' into quiz-refactor 2023-10-18 15:47:58 +05:30
Jannat Patel d996a5c53f Merge pull request #649 from NagariaHussain/feat-reply-to
feat: add reply_to in email students dialog
2023-10-18 12:35:46 +05:30
Jannat Patel b6dfc6ed4d Merge pull request #650 from NagariaHussain/feat-payment-info
feat: store batch/course in LMS Payment
2023-10-18 12:35:33 +05:30
Jannat Patel c7c2ba83f3 Merge branch 'main' into feat-payment-info 2023-10-18 12:12:19 +05:30
Hussain Nagaria 2bffabff05 style: fix linter 2023-10-18 12:11:23 +05:30
Hussain Nagaria 697e81df10 feat: add reply_to in email students 2023-10-18 12:11:23 +05:30
Jannat Patel f1b791845b Merge pull request #651 from pateljannat/editorjs-para
chore: bumped down paragraph plugin of editor js
2023-10-18 11:58:26 +05:30
Jannat Patel 6310845cdd chore: bunped down paragraph plugin of editor js 2023-10-18 11:47:15 +05:30
Hussain Nagaria 230cca63f3 feat: store batch/course in LMS payment 2023-10-17 23:18:43 +05:30
Hussain Nagaria af9f4d4b1e fix: remove unused import 2023-10-17 22:17:28 +05:30
Jannat Patel 0111ff9c99 feat: quiz marks and passing percentage 2023-10-17 20:06:04 +05:30
Jannat Patel 12bec14c92 feat: quiz validations and marks 2023-10-16 19:52:36 +05:30
Jannat Patel 174ea1ddd4 chore: resolved conflicts 2023-10-16 11:19:34 +05:30
Tunde Akinyanmi 038a7463e1 update get_neighbours to use LessonBookmark and
return the correct bookmark string
2023-10-13 18:39:11 +01:00
Tunde Akinyanmi a702909216 add LessonBookmark which is a data structure that
represents a bookmark.

While the underlying data structure is a tuple, it makes it easy to
abstract most of the logic we need and therefore allow the code to be
more readable.
2023-10-13 18:32:15 +01:00
Tunde Akinyanmi 8effd5614f remove cast operation from str to float.
It cause loss of the bookmark data
2023-10-13 18:14:11 +01:00
Jannat Patel a02365c223 Merge pull request #642 from pateljannat/course-permissions
fix: permissions
2023-10-13 19:43:50 +05:30
Jannat Patel 2d589aefa2 Merge pull request #643 from pateljannat/timetable-customisations
feat: timetable customisations
2023-10-13 19:39:15 +05:30
Jannat Patel bc2dc679a8 fix: revert ci changes 2023-10-13 18:15:49 +05:30
Jannat Patel f2432d78ee ci: added collation server for mariadb 2023-10-13 16:29:47 +05:30
Jannat Patel f27eecce1f ci: added collation server for mariadb 2023-10-13 16:17:58 +05:30
Jannat Patel caf967f2e2 ci: added collation server for mariadb 2023-10-13 16:13:45 +05:30
Jannat Patel eecc9b53df ci: added collation server for mariadb 2023-10-13 16:07:01 +05:30
Jannat Patel 8e12cae91f ci: added collation server for mariadb 2023-10-13 15:58:07 +05:30
Jannat Patel 12c5ad54e7 ci: added collation server for mariadb 2023-10-13 15:24:12 +05:30
Jannat Patel c20fa7e093 ci: added collation server for mariadb 2023-10-13 14:50:50 +05:30
Jannat Patel 4c83264c4a ci: added collation server for mariadb 2023-10-13 13:14:35 +05:30
Jannat Patel f592cf08d8 ci: added collation server for mariadb 2023-10-13 12:47:36 +05:30
Jannat Patel bf0cb25a88 ci: added collation server for mariadb 2023-10-13 12:33:16 +05:30
Jannat Patel 2ff3d83d8f ci: added collation server for mariadb 2023-10-13 11:52:38 +05:30
Jannat Patel 3f5c3e89c8 ci: added collation server for mariadb 2023-10-13 11:45:42 +05:30
Jannat Patel a1bb7962bc ci: added collation server for mariadb 2023-10-13 11:40:17 +05:30
Jannat Patel bf5cc5e1d1 ci: fixed mariadb options 2023-10-13 11:24:58 +05:30
Jannat Patel d840d2fc18 ci: fixed step in server tests script 2023-10-13 11:19:27 +05:30
Jannat Patel 1e458921e8 ci: fix server tests script 2023-10-13 11:17:41 +05:30
Jannat Patel 55feb41998 feat: timetable customisations 2023-10-13 10:59:44 +05:30
Jannat Patel a7dbdd844b feat: batch customisations 2023-10-12 21:20:36 +05:30
Jannat Patel f3d6ad6c84 fix: course permissions 2023-10-11 13:40:07 +05:30
Jannat Patel a0255e1743 feat: send email to batch students 2023-10-11 12:58:07 +05:30
Jannat Patel 1046d28092 feat: quiz refactor 2023-10-11 12:25:46 +05:30
Jannat Patel affd2b47bd Merge pull request #640 from pateljannat/registration-email
feat: batch registration confirmation email
2023-10-10 10:16:12 +05:30
Jannat Patel 814870fd69 feat: batch regisration confirmation email 2023-10-09 18:53:50 +05:30
Jannat Patel 50c1a566a8 Merge pull request #639 from pateljannat/summary
feat: assignment as text
2023-10-07 11:08:10 +05:30
Jannat Patel 47783997c6 feat: assignment as text 2023-10-06 15:32:53 +05:30
Jannat Patel 70d8505596 Merge pull request #637 from pateljannat/batch-emails
feat: send email to batch students
2023-10-05 21:59:46 +05:30
Jannat Patel 6e8cf9ca25 fix: category on batch edit 2023-10-05 17:24:04 +05:30
Jannat Patel c9cda6c6f5 fix: show email button only to moderators 2023-10-05 16:24:11 +05:30
Jannat Patel 6c4d3ea37e feat: send email to batch students 2023-10-05 16:12:02 +05:30
Jannat Patel 8ad0e99b3c Merge pull request #634 from pateljannat/template-days
feat: Days and Duration in timetable template
2023-10-04 13:06:36 +05:30
Jannat Patel 60277ed6e9 fix: onboarding style 2023-10-04 12:12:00 +05:30
Jannat Patel 7b570420ca fix: content collapse 2023-10-04 11:07:01 +05:30
Jannat Patel 9205b59e29 feat: days in timetable template 2023-10-04 10:44:16 +05:30
Jannat Patel 685c5babe5 Merge pull request #633 from pateljannat/pdf-upload-issue
fix: pdf rendering in lessons
2023-10-03 16:24:18 +05:30
Jannat Patel 681dc8fbc1 fix: pdf rendering in lessons 2023-10-03 16:09:11 +05:30
Jannat Patel 7c623b1a8d Merge pull request #632 from pateljannat/audio-in-lesson
feat: audio in lessons
2023-10-03 13:53:30 +05:30
Jannat Patel 277c089adc feat: audio in lessons 2023-10-03 13:33:59 +05:30
Jannat Patel cfc3c231ff fix: permissions for lms enrollment 2023-10-02 12:55:35 +05:30
Jannat Patel 1000a22490 fix: permissions for lms enrollment 2023-10-02 12:52:36 +05:30
Jannat Patel 65c0ebac50 Merge pull request #629 from pateljannat/student-role
feat: LMS Student Role
2023-09-29 19:22:23 +05:30
Jannat Patel 80843ec44b feat: assign LMS Student role to all signups 2023-09-29 18:59:08 +05:30
Jannat Patel be23220e01 feat: lms student role 2023-09-29 17:14:00 +05:30
Jannat Patel c82c10d17e Merge pull request #628 from pateljannat/batch-customisations
feat: batch customisations
2023-09-29 10:59:41 +05:30
Jannat Patel 5918b8be60 feat: batch customisations 2023-09-28 19:11:46 +05:30
Jannat Patel 647a0a8ff1 Merge pull request #626 from pateljannat/ins-notes-changes
feat: editor js for instructor notes
2023-09-28 11:32:00 +05:30
Jannat Patel bf3c6bc6be test: change lesson sequence 2023-09-28 10:39:30 +05:30
Jannat Patel cc7832614b fix: hide course header for students if no courses in batch 2023-09-28 10:14:10 +05:30
Jannat Patel d5387a0d1a test: fix course creation test 2023-09-27 19:57:37 +05:30
Jannat Patel 5d7ad973a2 Merge pull request #627 from pateljannat/batch-meta
feat: batch meta and raw details
2023-09-27 19:46:28 +05:30
Jannat Patel 0fcea692c7 feat: batch meta and raw details 2023-09-27 19:21:57 +05:30
Jannat Patel db71f1271b feat: editor js for instructor notes 2023-09-27 17:59:36 +05:30
Jannat Patel 3fde923190 Merge pull request #624 from pateljannat/billing-flow-issues
fix: billing flow issues
2023-09-27 09:17:53 +05:30
Jannat Patel 4f97760e8a fix: billing flow issues 2023-09-26 22:40:00 +05:30
Jannat Patel 5614a6203f Merge pull request #622 from pateljannat/issues
fix: sanitized inputs for people and course creation page
2023-09-25 22:49:25 +05:30
Jannat Patel 5727b7cd73 fix: sanitized inputs for people and course creation page 2023-09-25 22:08:37 +05:30
Jannat Patel 1c0644aa7a Merge pull request #619 from pateljannat/state-validation
fix: billing flow
2023-09-25 17:57:50 +05:30
Jannat Patel 23e6ebe8ee fix: multicurrency on course pages 2023-09-25 17:50:36 +05:30
Jannat Patel 5602c0b6c3 Merge branch 'main' of https://github.com/frappe/lms into state-validation 2023-09-25 09:48:09 +05:30
Jannat Patel 8e59c10b90 Merge pull request #610 from pateljannat/ins-notes
fix: instructor notes
2023-09-25 09:39:45 +05:30
Jannat Patel 90587b0508 fix: price update on country 2023-09-22 21:46:08 +05:30
Jannat Patel 153a8428f7 fix: billing flow 2023-09-21 12:52:31 +05:30
Jannat Patel 3d00d96716 Merge pull request #614 from pateljannat/timetable
feat: Batch Timetable
2023-09-20 13:07:09 +05:30
Jannat Patel fb9824301f fix: removed live class from template row 2023-09-20 13:00:51 +05:30
Jannat Patel 33f4e82399 fix: batch copy 2023-09-20 12:40:04 +05:30
Jannat Patel 0d99269109 feat: live class checkbox 2023-09-20 12:09:02 +05:30
Jannat Patel 8098532215 feat: timetable legends and template 2023-09-18 19:16:57 +05:30
Jannat Patel 24e9f46e2f feat: batch timetable 2023-09-15 21:55:06 +05:30
Jannat Patel 7c3b40f9d5 Merge pull request #613 from pateljannat/change-batch-course-naming
fix: batch course sequence id issue
2023-09-14 12:47:44 +05:30
Jannat Patel 29860583f4 fix: batch course sequence id issue 2023-09-14 12:34:34 +05:30
Jannat Patel 9c00a5561a Merge pull request #600 from pateljannat/paid-class
feat: Batches Revamp
2023-09-13 15:18:55 +05:30
Jannat Patel 82b8853f39 fix: patches 2023-09-13 15:10:52 +05:30
Jannat Patel c4ab91a565 feat: certified participants page 2023-09-13 13:07:20 +05:30
Jannat Patel 87e5096f5d fix: course card edit and delete button position 2023-09-13 10:39:32 +05:30
Jannat Patel 1a07021bbf fix: quiz list in lesson page 2023-09-12 18:03:56 +05:30
Jannat Patel 6ab4f15d0c feat: publish batches 2023-09-12 15:09:13 +05:30
Jannat Patel f137f8e048 feat: multicurrency 2023-09-12 12:13:41 +05:30
Jannat Patel 04501143ec feat: apply_gst in batches 2023-09-11 22:44:28 +05:30
Jannat Patel 07276f5c17 fix: renamed class to batch for live classes 2023-09-04 23:18:45 +05:30
Jannat Patel a9bd01b34e fix: instructor notes 2023-09-01 23:14:58 +05:30
Jannat Patel 93db82305f Merge pull request #607 from pateljannat/lesson-embed
feat: embeds in lesson
2023-08-31 23:38:23 +05:30
Jannat Patel ce09f27373 fix: assignment renderer 2023-08-31 23:32:46 +05:30
Jannat Patel ffd9d56896 feat: embed pdf 2023-08-31 23:29:56 +05:30
Jannat Patel 833e714a1f feat: embeds in lesson 2023-08-31 21:33:09 +05:30
Jannat Patel e402f322f6 Merge pull request #606 from pateljannat/instructor-notes
feat: instructor notes
2023-08-31 12:18:56 +05:30
Jannat Patel 2a0636b32b fix: field descriptions 2023-08-31 11:58:08 +05:30
Jannat Patel 677dc59399 feat: instructor notes 2023-08-31 11:49:51 +05:30
Jannat Patel 7678b89995 feat: setup frappe ui 2023-08-30 22:45:56 +05:30
Jannat Patel db408b21d2 chore: resolve conflicts 2023-08-30 14:38:18 +05:30
Jannat Patel fe08f4cf09 Merge pull request #605 from pateljannat/assignment-url
feat: Assignment as URL
2023-08-30 13:26:35 +05:30
Jannat Patel ccb7c1485b fix: validation for URL 2023-08-30 13:10:22 +05:30
Jannat Patel 4a76f42e35 feat: assignment url 2023-08-30 13:01:45 +05:30
Jannat Patel 6f31d50a27 fix: payment fetch failure after payment completion 2023-08-30 11:50:12 +05:30
Jannat Patel 018c26b885 fix: course enrollment 2023-08-29 22:25:40 +05:30
Jannat Patel f9f70f208f feat: certificate generation dialog 2023-08-29 16:50:14 +05:30
Jannat Patel b940ddca25 fix: batch ui and ux 2023-08-29 09:55:40 +05:30
Jannat Patel cd82527ef3 Merge branch 'main' of https://github.com/frappe/lms into paid-class 2023-08-28 11:15:27 +05:30
Jannat Patel f600f016ae fix: permissions for lms course doctype 2023-08-28 11:14:08 +05:30
Jannat Patel 27101ffd31 fix: renamed class to batch 2023-08-28 10:59:52 +05:30
Jannat Patel 9376b0b010 chore: resolved conflicts 2023-08-26 16:00:44 +05:30
Jannat Patel e2c1f6aa2d Merge pull request #602 from pateljannat/rename-batch-doctype
refactor: renamed batch and membership doctypes
2023-08-26 15:53:56 +05:30
Jannat Patel e2287cc73c Merge pull request #586 from niraj2477/fix-quiz-submission
fix: Add question in quiz submission
2023-08-26 15:53:22 +05:30
Jannat Patel c350ce1b60 fix: replaced batch references 2023-08-26 15:44:19 +05:30
Jannat Patel 09dbe0fed7 fix: replaced instances of batch to batch_old 2023-08-26 15:28:03 +05:30
Jannat Patel 12b3d16662 Merge branch 'main' of https://github.com/frappe/lms into rename-batch-doctype 2023-08-25 18:04:28 +05:30
Jannat Patel 1676329eb2 Merge pull request #572 from tahir-zaqout/fix-instructors
fix: course when instructor is not set
2023-08-25 18:02:59 +05:30
Jannat Patel 86434ea320 fix: removed fields array as there is pluck 2023-08-25 17:45:46 +05:30
Jannat Patel de6b4f7fb2 test: fix batch fieldname 2023-08-25 17:05:55 +05:30
Jannat Patel 6e488cba3e test: fix enrollment tests 2023-08-25 16:44:04 +05:30
Jannat Patel 03a6cc85fe test: enrollment and exercise test fixed 2023-08-25 15:19:29 +05:30
Jannat Patel b8b32681bf refactor: renamed batch and membership doctypes 2023-08-25 14:46:11 +05:30
Jannat Patel 7f67c6c6d9 Merge pull request #601 from pateljannat/link-class-to-eval-flow
feat: link class in evaluation flow
2023-08-25 10:08:38 +05:30
Jannat Patel 0487b2c987 chore: resolved conflicts 2023-08-24 22:17:45 +05:30
Jannat Patel d5f10db250 feat: capture gst information 2023-08-24 22:15:55 +05:30
Jannat Patel 74df0f19cf fix: class filter on certification doctypes 2023-08-23 14:52:56 +05:30
Jannat Patel 47c19b4e3d feat: gst fields in class student 2023-08-23 13:00:54 +05:30
Jannat Patel b197e36ba7 Merge pull request #599 from pateljannat/filter-mobile
fix: styling of course list menu
2023-08-23 10:43:37 +05:30
Jannat Patel 4b049dcf71 fix: styling of course list menu 2023-08-22 19:16:22 +05:30
Jannat Patel 04ed7f412f feat: class billing 2023-08-22 18:34:42 +05:30
Jannat Patel ac64e59c43 chore: resolved conflicts 2023-08-19 12:26:21 +05:30
Jannat Patel d5524a8d67 feat: registration information in class student 2023-08-19 12:24:13 +05:30
Jannat Patel bc350a2661 Merge pull request #595 from pateljannat/revert-registration
revert: class registration
2023-08-18 19:09:19 +05:30
Jannat Patel 575fb623ba revert: class registration 2023-08-18 18:59:02 +05:30
Jannat Patel b7783659c9 Merge branch 'main' of https://github.com/frappe/lms 2023-08-18 17:39:02 +05:30
Jannat Patel bddd4743a7 fix: reload course doctype 2023-08-18 17:38:20 +05:30
Jannat Patel ce8ac15faa Merge pull request #594 from pateljannat/user-validate-image
fix: dont validate user uploaded files
2023-08-18 15:19:57 +05:30
Jannat Patel 46e7c83fae fix: dont validate user uploaded files 2023-08-18 15:13:34 +05:30
Jannat Patel 3dcb55f603 Merge pull request #592 from pateljannat/course-filter
feat: course filters
2023-08-18 13:05:24 +05:30
Jannat Patel fb3e0832d6 chore: removed unnecessary print statements 2023-08-18 12:49:43 +05:30
Jannat Patel 982d6c9045 fix: popularity filter for enrolled and authored courses 2023-08-18 12:39:19 +05:30
Jannat Patel a061a89ee7 fix: paid course details on course card template 2023-08-17 22:06:25 +05:30
Jannat Patel 00bb71f714 chore: resolved conflicts 2023-08-17 21:25:52 +05:30
Jannat Patel e23cfac5a7 Merge pull request #589 from pateljannat/paid-courses
feat: Paid courses
2023-08-17 14:44:29 +05:30
Jannat Patel ed651959c1 fix: amount information in membership 2023-08-17 14:20:30 +05:30
Jannat Patel 01a1632a5a feat: course filters 2023-08-16 22:01:59 +05:30
Jannat Patel c2a6697f72 fix: show price on all course cards 2023-08-16 11:51:05 +05:30
Jannat Patel 211775dba5 fix: formatting 2023-08-16 11:00:06 +05:30
Jannat Patel 2ba85ba6a7 feat: paid course from course creation form 2023-08-14 19:30:33 +05:30
Jannat Patel 3b3f1d692f Merge branch 'main' of https://github.com/frappe/lms into paid-courses 2023-08-14 09:59:46 +05:30
Ankush Menat d90bb1e5ea fix: escape arguments 2023-08-13 23:37:16 +05:30
Jannat Patel 0c14a1ab4c feat: payment verification and membership 2023-08-11 19:45:12 +05:30
Jannat Patel ea27acc683 Merge branch 'main' of https://github.com/frappe/lms into paid-courses 2023-08-10 13:33:44 +05:30
14987 b2122e7707 fix: add question in quiz submission 2023-08-10 13:19:33 +05:30
Jannat Patel 9cdc8a50f6 Merge pull request #580 from pateljannat/class-flow
feat: Class flow
2023-08-10 13:14:27 +05:30
Jannat Patel 03620be7bb fix: class schedule date and time validation 2023-08-10 13:00:26 +05:30
Jannat Patel 55296cd9cc fix: show progress on class schedule 2023-08-10 11:51:16 +05:30
Jannat Patel 5fefea1434 Merge branch 'main' of https://github.com/frappe/lms into class-flow 2023-08-09 17:22:44 +05:30
Jannat Patel 66dbe68a15 Merge pull request #583 from pateljannat/certificate-share
fix: Certificate share
2023-08-09 17:10:14 +05:30
Jannat Patel 066e2ddc69 fix: print format value 2023-08-09 17:03:10 +05:30
Jannat Patel 59f08ad4da fix: raise error if certificate is not found in any condition 2023-08-09 16:57:25 +05:30
Jannat Patel 551936e7c4 fix: show logo on certificate only if its present 2023-08-09 16:29:36 +05:30
Jannat Patel 4660240395 fix: certificate share 2023-08-09 14:29:51 +05:30
Jannat Patel 5d0a50242e fix: progress marking for normal content 2023-08-09 12:37:56 +05:30
Jannat Patel 141a778c9a chore: resolved conflicts 2023-08-09 11:49:00 +05:30
Jannat Patel d83d6cf2d8 Merge pull request #559 from pateljannat/class-revamp
feat: discussions and class dashboard
2023-08-09 11:18:44 +05:30
Jannat Patel 71dc32098e fix: removed unnecessary code 2023-08-09 11:09:17 +05:30
Jannat Patel 6e47b4a941 test: fix discussions test 2023-08-09 10:53:52 +05:30
Jannat Patel 8479e90aeb fix: allow evaluators to access the discussions section 2023-08-09 10:16:48 +05:30
Jannat Patel 24276b779d fix: progress access by students 2023-08-09 10:13:02 +05:30
Jannat Patel 47e254ed9b fix: flow UI and quiz progress 2023-08-07 21:17:23 +05:30
Jannat Patel 9c021ef3b1 feat: razorpay order creation and checkout redirection 2023-08-04 19:37:08 +05:30
Jannat Patel c284e95dc8 feat: validate razorpay data 2023-08-03 11:46:59 +05:30
Jannat Patel 39663a872c Merge branch 'main' of https://github.com/frappe/lms into paid-courses 2023-08-02 18:50:57 +05:30
Jannat Patel 14cefca735 Merge pull request #579 from pateljannat/fix-gha-dependencies
ci: remove mysql
2023-08-02 18:27:49 +05:30
Jannat Patel 55c56207c2 ci: remove mysql 2023-08-02 18:19:45 +05:30
Jannat Patel 79d9f31db7 feat: paid courses 2023-08-02 18:08:42 +05:30
Jannat Patel 845b906851 feat: redirection from class flow 2023-08-01 18:02:02 +05:30
Jannat Patel 5d2b19cc43 feat: learning flow in class 2023-08-01 10:10:06 +05:30
Jannat Patel a5bc30f776 Merge pull request #576 from pateljannat/evaluation-duplication
fix: eval request duplicate conditions
2023-07-31 14:49:44 +05:30
Jannat Patel cce77a475a chore: removed print statement 2023-07-31 14:42:35 +05:30
Jannat Patel 13a26321f5 fix: eval request duplicate conditions 2023-07-31 13:25:12 +05:30
Jannat Patel e7a2eb7373 feat: student dashboard 2023-07-31 12:36:13 +05:30
tahirAnvil 1cc168404a fix: get_instructors function 2023-07-27 12:07:11 +03:00
Jannat Patel cef3d21ab3 Merge branch 'main' of https://github.com/frappe/lms into class-revamp 2023-07-26 12:27:16 +05:30
Jannat Patel d0ac0e4523 Merge pull request #571 from pateljannat/fix-escription
fix: course card descriptions
2023-07-26 12:24:34 +05:30
Jannat Patel abaa7754a6 fix: adding dependency mariadb-client-core-10.6 for UI Test 2023-07-26 12:17:32 +05:30
Jannat Patel 02e875cbdc Merge branch 'main' of https://github.com/frappe/lms into fix-escription 2023-07-26 11:44:24 +05:30
Jannat Patel a218257952 fix: course card descriptions 2023-07-26 11:09:35 +05:30
Jannat Patel 7dfcabde5e chore: resolved conflicts 2023-07-26 11:00:27 +05:30
Jannat Patel 6573602dfc Merge pull request #570 from pateljannat/remove-dependencies
chore: remove dev dependencies
2023-07-25 19:27:19 +05:30
Jannat Patel 3c374f48b3 ci: manually installing cypress 2023-07-25 19:20:55 +05:30
Jannat Patel 2412ef0260 fix: dependencies 2023-07-25 18:48:31 +05:30
Jannat Patel d4dcfcdbc6 chore: remove dev dependencies 2023-07-25 18:06:25 +05:30
Jannat Patel 60aec7c801 Merge pull request #569 from pateljannat/fix-telemetry
fix: telemetry
2023-07-25 17:29:36 +05:30
Jannat Patel 1862d726ad fix: telemetry 2023-07-25 17:15:56 +05:30
Jannat Patel 3d27d5f755 fix: upcoming evals query 2023-07-25 10:50:56 +05:30
Jannat Patel 0b3f76590f Merge branch 'main' of https://github.com/frappe/lms into class-revamp 2023-07-24 18:25:58 +05:30
Jannat Patel 294832834c fix: ignore permissions while eval creations 2023-07-24 18:25:36 +05:30
Jannat Patel e3338e0236 Merge pull request #562 from pateljannat/class-evaluator
Class evaluator
2023-07-24 18:23:19 +05:30
Jannat Patel 5c7ae55775 Merge branch 'main' of https://github.com/frappe/lms into class-evaluator 2023-07-24 17:14:46 +05:30
Jannat Patel bc8827547e fix: scheduled the eval event creation 2023-07-24 17:10:03 +05:30
Jannat Patel 7990675c5c fix: evaluator in evals and link field descriptions 2023-07-21 12:46:33 +05:30
Jannat Patel 0182db8030 fix: show upcoming evals in progress page 2023-07-20 20:16:13 +05:30
Jannat Patel 295feccb49 fix: check booked slots against both day and time 2023-07-17 14:28:25 +05:30
Jannat Patel b5005f41fe feat: schedule evaluations 2023-07-14 20:56:21 +05:30
Jannat Patel 37f06a8ba4 Merge branch 'main' of https://github.com/frappe/lms into class-evaluator 2023-07-14 10:34:22 +05:30
Jannat Patel 71d421898d Merge pull request #561 from pateljannat/fix-docker
fix: use node 18 for docker
2023-07-13 17:16:05 +05:30
Jannat Patel bf5a69cee4 use node 18 for docker 2023-07-13 17:08:05 +05:30
Jannat Patel 11e6b8a372 feat: class evaluators 2023-07-13 15:10:53 +05:30
Jannat Patel d763dba204 discussions in class 2023-07-11 19:29:30 +05:30
Jannat Patel 9e5cd84214 Merge pull request #558 from pateljannat/quiz-with-no-answer-check
feat: show and hide quiz answers
2023-07-10 15:03:56 +05:30
Jannat Patel 14cf0c9ae1 test: fix flaky course creation test 2023-07-10 14:56:36 +05:30
Jannat Patel 7d410e9ec8 fix: removed print statement 2023-07-10 14:30:05 +05:30
Jannat Patel 07c3d423aa Merge branch 'main' of https://github.com/frappe/lms into quiz-with-no-answer-check 2023-07-10 12:33:25 +05:30
Jannat Patel 5d8003549f Merge pull request #556 from pateljannat/minor-ux
fix: UX Improvements
2023-07-10 12:01:13 +05:30
Jannat Patel b286daad16 feat: show and hide quiz answers 2023-07-04 19:42:12 +05:30
Jannat Patel caa9144a12 fix: progress page width 2023-07-03 14:58:12 +05:30
Jannat Patel 3606902753 fix: ux improvements 2023-06-28 16:55:43 +05:30
Jannat Patel 1abb75a58e fix: certificate duplication validation 2023-06-27 14:37:53 +05:30
Jannat Patel d35c15c384 Merge pull request #554 from pateljannat/class-ui
fix: class improvements
2023-06-27 14:35:56 +05:30
Jannat Patel 1888209027 test: upgrade node version 2023-06-27 12:51:31 +05:30
Jannat Patel f3830bfdd5 fix: assessment validation 2023-06-27 12:17:00 +05:30
Jannat Patel 0e1b91f1ec fix: validate duplication 2023-06-26 21:16:27 +05:30
Jannat Patel 8353aa24f3 feat: description in class card 2023-06-26 13:00:45 +05:30
Jannat Patel 99f1a8dfc3 fix: class improvements 2023-06-23 20:16:48 +05:30
Jannat Patel 3d8237008f Merge pull request #551 from pateljannat/quiz-in-classes
feat: quiz in classes
2023-06-22 11:51:13 +05:30
Jannat Patel 22199da7d4 fix: linters 2023-06-22 11:25:32 +05:30
Jannat Patel d8e11f69cc fix: quiz creation url 2023-06-22 11:14:15 +05:30
Jannat Patel c9a5c0801e fix: redirect after quiz submission 2023-06-22 10:53:11 +05:30
Jannat Patel bb0abe27cd fix: redirect after quiz submission 2023-06-22 10:52:57 +05:30
Jannat Patel 7d18e1d928 fix: quiz max attempts 2023-06-21 20:11:30 +05:30
Jannat Patel da72513f6a feat: quiz in classes 2023-06-20 20:12:10 +05:30
Jannat Patel 6f8c161e03 Merge pull request #549 from pateljannat/profile-form
fix: profile web form
2023-06-19 11:25:36 +05:30
Jannat Patel ac1f02971f fix: profile web form 2023-06-19 10:55:10 +05:30
Jannat Patel d19538abd2 Merge pull request #545 from pateljannat/quiz-enhancements-2
fix: quiz list in dialog
2023-06-16 14:27:30 +05:30
Jannat Patel b1ab7e7783 fix: removed unnecesary comments 2023-06-16 13:44:55 +05:30
Jannat Patel 35c080fcc2 fix: quiz dialog display 2023-06-16 13:08:49 +05:30
Jannat Patel 43e89d9dc2 Merge branch 'main' of https://github.com/frappe/lms into quiz-enhancements-2 2023-06-16 10:12:02 +05:30
Jannat Patel 547b69dd31 Merge pull request #544 from pateljannat/class-medium-and-category
feat: class medium and category
2023-06-15 17:28:24 +05:30
Jannat Patel 1ff8514b22 feat: class medium and category 2023-06-15 17:07:28 +05:30
Jannat Patel 5fffe51c4e fix: quiz in lessons 2023-06-15 11:18:17 +05:30
Jannat Patel af9aa3e37b fix: verison and readme 2023-06-14 15:03:18 +05:30
Jannat Patel d644ee7ccd Merge branch 'main' of https://github.com/frappe/lms 2023-06-14 14:39:49 +05:30
Jannat Patel 08e3278ca0 feat: track visit on lesson page 2023-06-14 14:39:14 +05:30
Jannat Patel 85feaa00fc Merge pull request #540 from pateljannat/quiz-modal
fix: quiz enhancements
2023-06-14 10:38:14 +05:30
Jannat Patel 76ba5c188e fix: arguements for set_single_value 2023-06-13 20:40:48 +05:30
Jannat Patel 9941e0e936 fix: linters and tests 2023-06-13 20:21:02 +05:30
Jannat Patel 89206f94f0 fix: show only first line in questions table 2023-06-13 19:39:00 +05:30
Jannat Patel 43128d7ea3 chore: resolved conflicts 2023-06-13 18:58:44 +05:30
Jannat Patel 6f1026434d fix: quiz enhancements 2023-06-13 18:44:37 +05:30
Jannat Patel db35e3e425 Merge pull request #539 from pateljannat/quiz-enhancements
feat: quiz option as small text
2023-06-12 10:27:07 +05:30
Jannat Patel 1d8de792a5 feat: quiz option as small text 2023-06-09 18:09:54 +05:30
Jannat Patel 0db47dfee1 Merge pull request #537 from pateljannat/general
fix: misc issues
2023-06-08 11:19:58 +05:30
Jannat Patel fc086fdbc3 fix: misc issues 2023-06-08 11:02:42 +05:30
Jannat Patel 8a86d19b79 Merge pull request #535 from pateljannat/course-publish-issue
fix: show course settings only to moderators
2023-06-07 16:56:47 +05:30
Jannat Patel 9198302f7e fix: show course settings only to moderators 2023-06-07 16:53:46 +05:30
Jannat Patel d076451ea8 Merge pull request #534 from pateljannat/onboarding-redirects
fix: Onboarding redirects
2023-06-07 16:02:48 +05:30
Jannat Patel c2e9ef59d6 fix: onboarding conditions 2023-06-07 15:43:44 +05:30
Jannat Patel 100f72de9d Merge branch 'main' of https://github.com/frappe/lms into onboarding-redirects 2023-06-07 15:06:14 +05:30
Jannat Patel 5a32109d5d docs: updated FC link in readme 2023-06-06 22:20:27 +05:30
Jannat Patel f5e7934906 docs: fixed FC signup button 2023-06-06 22:09:41 +05:30
Jannat Patel 9800c24939 docs: FC signup button on readme 2023-06-06 22:08:24 +05:30
Jannat Patel dcd81e0a3f fix: onboarding links 2023-06-06 22:06:01 +05:30
Jannat Patel 6574b55440 docs: fix logo in readme 2023-06-06 12:57:06 +05:30
Jannat Patel 8474d1c8c4 docs: PH embed on readme 2023-06-06 12:55:32 +05:30
Jannat Patel 38ae9ab9f5 Merge pull request #532 from pateljannat/video-with-spaces
fix: embed video with spaces in name
2023-06-06 09:59:03 +05:30
Jannat Patel 659b35f03e fix: embed video with spaces in name 2023-06-05 16:17:43 +05:30
Jannat Patel 414f126f1e Merge pull request #529 from pateljannat/lesson-assignment-fixes
fix: assignment submission in lesson
2023-06-05 10:59:07 +05:30
Jannat Patel b336d769c8 fix: assignment submission in lesson 2023-06-05 10:15:40 +05:30
Jannat Patel c173953c6a Merge pull request #520 from pateljannat/assignments-in-classes
feat: assignments in class
2023-06-02 15:56:49 +05:30
Jannat Patel afac45e65f fix: assignment evaluator 2023-06-02 15:37:02 +05:30
Jannat Patel f0aa5b8744 fix: new assessment doc creation 2023-06-02 14:33:55 +05:30
Jannat Patel a101e7b089 fix: class pages 2023-06-02 13:53:09 +05:30
Jannat Patel 85903d5385 feat: my class tab 2023-06-01 22:44:32 +05:30
Jannat Patel fe80ef9b85 fix: progress view 2023-06-01 14:29:15 +05:30
Jannat Patel 961f8c1627 Merge branch 'main' of https://github.com/frappe/lms into assignments-in-classes 2023-06-01 12:56:54 +05:30
Jannat Patel 6c7fc9b317 Merge pull request #522 from pateljannat/quiz-answer-fix
fix: possible answer check
2023-05-31 11:30:02 +05:30
Jannat Patel 2afa14d68e fix: possible answer check 2023-05-31 11:13:39 +05:30
Jannat Patel f6cdac4826 feat: assessment in progress 2023-05-31 10:35:12 +05:30
Jannat Patel bb39999b84 feat: assessment tab in class 2023-05-30 22:11:14 +05:30
Jannat Patel 70a036e5a7 fix: remove lesson assignment references 2023-05-26 17:20:53 +05:30
Jannat Patel 0432751050 feat: lesson assignment renamed to lms assignment submission 2023-05-25 22:44:56 +05:30
Jannat Patel 36b3b1d086 Update README.md 2023-05-24 22:46:21 +05:30
Jannat Patel 6a783e540b docs: updated readme logo 2023-05-24 22:39:56 +05:30
Jannat Patel daeeb693d6 Merge pull request #519 from pateljannat/fix-username
fix: remove space from username
2023-05-22 17:54:53 +05:30
Jannat Patel a0b06be422 test: fixed username length test 2023-05-19 18:03:36 +05:30
Jannat Patel 4b2ba96435 test: removed invalid tests 2023-05-19 17:46:55 +05:30
Jannat Patel 10510e204f fix: removed unused functions 2023-05-19 17:34:47 +05:30
Jannat Patel 032749dd01 fix: remove space from username 2023-05-19 16:38:47 +05:30
Jannat Patel dc65bff772 Merge pull request #518 from pateljannat/telemetry-changes
fix: telemetry capture on client side
2023-05-18 14:52:35 +05:30
Jannat Patel 56266a3774 fix: load telemetry js irrespective of telemetry settings 2023-05-18 14:42:27 +05:30
Jannat Patel 93f0f8ab44 fix: telemetry capture on client side 2023-05-18 14:26:48 +05:30
Jannat Patel 611cc4d5a1 Merge pull request #515 from pateljannat/class-improvements
fix: Class improvements
2023-05-16 17:18:53 +05:30
Jannat Patel 552b0c9616 fix: sort classes by start date 2023-05-16 17:10:50 +05:30
Jannat Patel 1327b033e6 fix: removed student details doctype 2023-05-16 16:47:41 +05:30
Jannat Patel ae42828771 fix: course and student interactions in class 2023-05-16 16:14:13 +05:30
Jannat Patel 1df6319164 chore: fixed conflicts 2023-05-15 19:44:50 +05:30
Jannat Patel 95012072fc Merge pull request #514 from pateljannat/social-links
fix: course details link preview
2023-05-15 14:11:52 +05:30
Jannat Patel c01c248202 fix: course details link preview 2023-05-15 13:13:45 +05:30
Jannat Patel 0093025e5d Merge pull request #513 from pateljannat/style-issue
fix: change primary color back to frappe blue
2023-05-12 16:37:46 +05:30
Jannat Patel 20398cb934 fix: primary color 2023-05-12 16:29:39 +05:30
Jannat Patel 2792eb53b7 Merge pull request #511 from pateljannat/analytics
feat: analytics for course creation journey
2023-05-11 16:50:34 +05:30
Jannat Patel b2f8f796b9 Merge pull request #512 from pateljannat/illegal-course
fix: course creation url in LMS
2023-05-11 16:38:23 +05:30
Jannat Patel 39bb3149c9 fix: course creation url in LMS 2023-05-11 16:26:09 +05:30
Jannat Patel 1e610f7fbb feat: analytics for course creation journey 2023-05-11 15:29:11 +05:30
Jannat Patel c760fd5776 Merge pull request #510 from pateljannat/new-design-system
New design system
2023-05-11 12:53:45 +05:30
Jannat Patel 2162963926 fix: removed unnecessary lines of code 2023-05-11 12:40:43 +05:30
Jannat Patel c3f3a110c0 fix: validations and UI 2023-05-11 12:01:32 +05:30
Jannat Patel 0e444ab7d3 test: fixed course creation test 2023-05-10 19:35:45 +05:30
Jannat Patel 752fe5b4ba feat: reorder chapters, lessons 2023-05-08 19:07:28 +05:30
Jannat Patel dce369638a Merge pull request #509 from pateljannat/community-page-guest-access
fix: don't allow guest users to search the people page
2023-05-05 14:50:20 +05:30
Jannat Patel 911cfe9d2f Merge pull request #508 from pateljannat/share-certificate-on-creation
fix: share certificate with member on creation
2023-05-05 13:26:23 +05:30
Jannat Patel f4e882ba3e fix: don't allow guest users to search the people page 2023-05-05 13:22:07 +05:30
Jannat Patel 211c69bb41 feat: Video and Header component for a lesson 2023-05-05 11:53:04 +05:30
Jannat Patel b592172b82 Merge pull request #507 from pateljannat/class-seat-count
feat: Class seat count, start time and end time
2023-05-04 12:11:20 +05:30
Jannat Patel 40445cbb94 fix: share certificate with member on creation 2023-05-04 12:08:01 +05:30
Jannat Patel 20c93b3a6b fix: fetch start and end time in modal 2023-05-03 23:10:46 +05:30
Jannat Patel e2bf324fb4 feat: start and end time in class 2023-05-03 23:08:02 +05:30
Jannat Patel b47ff80e9d feat: seat count from class dialog 2023-05-03 22:47:39 +05:30
Jannat Patel e10feb3c36 feat: seat count in class 2023-05-03 21:02:57 +05:30
Jannat Patel b8471dd753 feat: paid classes and seat count 2023-05-03 20:55:49 +05:30
Jannat Patel 125c06952a Merge branch 'main' of https://github.com/frappe/lms into class-improvements 2023-05-03 17:41:44 +05:30
Jannat Patel 4336839932 feat: edit existing lesson 2023-05-03 17:41:18 +05:30
Jannat Patel bbdfaa32e9 Merge branch 'main' of https://github.com/frappe/lms into new-design-system 2023-05-02 14:46:24 +05:30
Jannat Patel 4f52a73029 Merge pull request #506 from pateljannat/revert-text-editor
revert: text editor for lesson and course
2023-05-02 14:46:03 +05:30
Jannat Patel 1a2f693fea revert: text editor for lesson and course 2023-05-02 14:22:43 +05:30
Jannat Patel ab8b76cada feat: lesson editor youtube and quiz components 2023-05-02 11:09:46 +05:30
Jannat Patel b5240f0eec feat: class improvements 2023-04-27 22:29:45 +05:30
Jannat Patel 7777bd02e3 feat: lesson edit page 2023-04-27 10:20:50 +05:30
Jannat Patel fcdd70dcc7 feat: course outline page 2023-04-26 11:46:08 +05:30
Jannat Patel 4eb5390ad8 feat: redesign lesson page 2023-04-25 20:54:57 +05:30
Jannat Patel 3b5c47222d feat: data in course fields 2023-04-21 18:17:37 +05:30
Jannat Patel f97ae4e4e2 feat: adding editorjs 2023-04-21 09:58:59 +05:30
Jannat Patel 33db16a1a2 Merge branch 'new-editor' of https://github.com/pateljannat/lms into new-design-system 2023-04-20 17:55:36 +05:30
Jannat Patel 6232f8703e feat: new design system for exisitng course home 2023-04-20 17:55:03 +05:30
Jannat Patel e6621ad866 Merge pull request #499 from pateljannat/certificate
feat: Certificate export as PDF
2023-04-18 18:45:34 +05:30
Jannat Patel 6a1533191a Merge branch 'main' into certificate 2023-04-18 18:14:41 +05:30
Jannat Patel a0782c7bf7 feat: editor js import 2023-04-18 11:51:57 +05:30
Jannat Patel 2b6436915d feat: design for course list count 2023-04-18 09:14:59 +05:30
Jannat Patel 4c220a67f2 Merge pull request #498 from pateljannat/new-class-modal
feat: New Class Dialog
2023-04-17 21:52:43 +05:30
Jannat Patel 110aab00d6 fix: removed unnecessary code 2023-04-17 16:53:48 +05:30
Jannat Patel 8e8111d272 fix: certificate page UI 2023-04-17 15:00:18 +05:30
Jannat Patel 53d2e288d4 feat: certificate pdf and custom certificate 2023-04-14 17:38:24 +05:30
Jannat Patel 262c1ea371 feat: certificate download as pdf 2023-04-12 23:15:52 +05:30
Jannat Patel 7be9eb09e8 fix: exponse class info only to moderators 2023-04-11 17:09:38 +05:30
Jannat Patel 5fb7e88318 feat: edit class 2023-04-11 16:45:34 +05:30
Jannat Patel d9c50714f4 fix: reload lesson assignment doctype in patch 2023-04-10 22:44:47 +05:30
Jannat Patel 0a91e5aa05 fix: reload question doctype in patch 2023-04-10 22:35:33 +05:30
Jannat Patel 9b70b4212f feat: class dialog 2023-04-10 22:34:24 +05:30
Jannat Patel 9f525d69b6 Merge pull request #497 from pateljannat/text-editor
feat: Text editor for course description and Lesson Content
2023-04-07 21:25:03 +05:30
Jannat Patel b09c4753da fix: removed print statements 2023-04-07 21:06:16 +05:30
Jannat Patel e4b4556210 feat: text editor for description 2023-04-06 18:01:12 +05:30
Jannat Patel fafd132768 feat: text editor for lesson body 2023-04-05 14:13:18 +05:30
Jannat Patel 67dc6d1f29 Merge pull request #496 from pateljannat/cypress
test: Course Creation UI
2023-04-04 16:48:52 +05:30
Jannat Patel 969cb37cfe test: changed test user 2023-04-03 22:23:04 +05:30
Jannat Patel 94c2be9919 test: removed beforeEach 2023-04-03 22:13:26 +05:30
Jannat Patel 5089285913 test: mariadb password 2023-04-03 22:01:14 +05:30
Jannat Patel e80920ad6c test: setup requirements 2023-04-03 21:46:25 +05:30
Jannat Patel d6606ab898 test: site_config in helper 2023-04-03 21:41:30 +05:30
Jannat Patel 41599348c4 test: added install_dependencies and install script 2023-04-03 15:44:21 +05:30
Jannat Patel 92a8ce6ef4 test: course creation flow 2023-04-03 15:19:54 +05:30
Jannat Patel 690a86bb69 Merge branch 'main' of https://github.com/frappe/lms into cypress 2023-03-31 16:46:29 +05:30
Jannat Patel cde4b61cea Merge pull request #494 from pateljannat/move-lessons
feat: move chapters and lessons
2023-03-31 16:45:26 +05:30
Jannat Patel f361c42a30 feat: move chapters and lessons 2023-03-31 16:30:38 +05:30
Jannat Patel 065646ed5d test: cypress setup 2023-03-29 17:13:51 +05:30
Jannat Patel de399166f1 fix: only allow class students to see progress 2023-03-28 16:30:14 +05:30
Jannat Patel a3a4d7fbd0 Merge pull request #493 from pateljannat/notification-on-assignment-submission
feat: notification on assignment submission
2023-03-28 16:03:23 +05:30
Jannat Patel a7c1595978 fix: spacing in email 2023-03-27 17:38:26 +05:30
Jannat Patel 1a8d113ad8 feat: notification on assignment submission 2023-03-27 17:32:43 +05:30
Jannat Patel 72cbbf147f Merge pull request #491 from pateljannat/quiz-input
feat: quiz with user input
2023-03-27 13:04:39 +05:30
Jannat Patel a0e6462c13 fix: new question with possible answers 2023-03-27 12:53:14 +05:30
Jannat Patel b37f259804 test: quiz with no possible answer 2023-03-27 08:47:07 +05:30
Jannat Patel 2fbe5dacb2 feat: user input quiz portal form 2023-03-24 18:06:42 +05:30
Jannat Patel 3150cf2510 feat: quiz with user input 2023-03-23 22:22:57 +05:30
Jannat Patel 3b1b375d5b Merge pull request #487 from pateljannat/live-class
feat: live class
2023-03-16 12:30:05 +05:30
Jannat Patel 3c0a29d4c7 fix: removed unnecessary changes 2023-03-16 12:24:12 +05:30
Jannat Patel 817bc4441f feat: ui for class cards 2023-03-16 11:23:24 +05:30
Jannat Patel 07e1aaaa66 fix: removed print statements 2023-03-15 12:15:44 +05:30
Jannat Patel 35b77a8908 feat: timezone and recording 2023-03-15 10:52:05 +05:30
Jannat Patel d5b4af95ff Merge branch 'main' of https://github.com/frappe/lms into live-class 2023-03-14 14:36:22 +05:30
Jannat Patel fc6a50b13f docs: docker instructions update in readme 2023-03-14 13:19:27 +05:30
Jannat Patel 8415abec6e Merge pull request #489 from pateljannat/delete-roles-after-uninstall
fix: delete roles after uninstall
2023-03-14 11:01:50 +05:30
Jannat Patel ea9ca67d1e fix: delete using before_uninstall hook 2023-03-14 10:56:08 +05:30
Jannat Patel 8201506c5f fix: delete roles after uninstall 2023-03-14 10:32:31 +05:30
Jannat Patel 5fc879b0ef fix: formatting 2023-03-13 18:14:14 +05:30
Jannat Patel bfde847045 Merge pull request #488 from pateljannat/session_redirection_issues
fix: redirection after completing setup wizard
2023-03-13 18:03:42 +05:30
Jannat Patel d96e3f4f9f fix: don't show past classes 2023-03-13 18:03:03 +05:30
Jannat Patel 0593a9fb30 fix: add student section 2023-03-13 15:47:51 +05:30
Jannat Patel c03cca21e8 fix: redirection after completing setup wizard 2023-03-10 23:08:00 +05:30
Jannat Patel 170b1b0dcc fix: live class card layout 2023-03-09 21:40:49 +05:30
Jannat Patel cb9c7966d9 fix: uncomment live class event creation 2023-03-08 10:19:44 +05:30
Jannat Patel b9c2222951 feat: create event for live class 2023-03-06 19:45:54 +05:30
Jannat Patel dfef5ca26c Merge branch 'main' of https://github.com/frappe/lms into live-class 2023-03-03 18:45:39 +05:30
Jannat Patel bce60a8657 Merge pull request #484 from pateljannat/mini-fix 2023-03-03 18:35:36 +05:30
Jannat Patel 2b244bb4f4 test: fix lms exercise doctype name 2023-03-03 18:23:49 +05:30
Jannat Patel 31b08eb545 test: fix lms exercise doctype name 2023-03-03 18:16:29 +05:30
Jannat Patel 9b7817a57f fix: exercise conflict and progress member 2023-03-03 18:03:35 +05:30
Jannat Patel bb0f3d5962 feat: live class list display 2023-03-03 15:15:49 +05:30
Jannat Patel 23c78d5801 Merge branch 'main' of https://github.com/frappe/lms 2023-03-02 22:48:29 +05:30
Jannat Patel cd3236976f fix: class list settings 2023-03-02 22:48:26 +05:30
Jannat Patel e6096bf9ed feat: live class modal 2023-03-02 19:33:12 +05:30
Jannat Patel a502603915 Merge pull request #483 from pateljannat/certificate-request 2023-03-01 17:49:37 +05:30
Jannat Patel 7566565f55 fix: certificate request notification 2023-02-28 19:55:21 +05:30
Faris Ansari f56f0b5366 Update README.md 2023-02-28 13:21:47 +05:30
Jannat Patel 34870b4625 feat: live class 2023-02-28 09:19:37 +05:30
Jannat Patel 3ee592a989 Merge pull request #482 from pateljannat/misc-fix 2023-02-27 09:13:59 +05:30
Jannat Patel d6d7e05b51 fix: quiz and assignment submission 2023-02-27 09:05:25 +05:30
Jannat Patel 07eaec2ded Merge pull request #480 from pateljannat/class-fixes 2023-02-23 14:12:44 +05:30
Jannat Patel 296a7e6023 fix: translation syntax 2023-02-23 13:04:47 +05:30
Jannat Patel 54827edd7e fix: modified timestamp 2023-02-23 13:01:45 +05:30
Jannat Patel d87fb81cf3 fix: class issues 2023-02-23 12:40:07 +05:30
Jannat Patel 99a7c47798 Merge pull request #478 from pateljannat/preview-video 2023-02-21 10:31:33 +05:30
Jannat Patel 080a02589c fix: accept only embed id for preview video 2023-02-21 09:52:20 +05:30
Jannat Patel d1e7549da9 Merge pull request #477 from pateljannat/evaluation-event 2023-02-17 11:01:54 +05:30
Jannat Patel 8e1ef1dc77 fix: layout of certification request 2023-02-17 10:52:50 +05:30
Jannat Patel 619a2f9d80 fix: only link calendars that are enabled 2023-02-16 20:20:16 +05:30
Jannat Patel 926444767b feat: event for evaluation 2023-02-16 20:11:03 +05:30
Jannat Patel 6bf4020ad1 Merge pull request #474 from fproldan/translations_es 2023-02-09 10:59:50 +05:30
Jannat Patel cb63ad8ed2 Merge pull request #475 from pateljannat/default-view 2023-02-08 13:07:16 +05:30
Jannat Patel 458ed9ad95 feat: default home setting 2023-02-07 19:58:06 +05:30
fproldan a11df1a237 feat: es translations 2023-02-01 12:48:11 -03:00
fproldan 352d4b9ab9 feat: es translations 2023-02-01 12:43:17 -03:00
Jannat Patel 275ded0658 fix: fullscreen for preview video 2023-01-18 15:07:04 +05:30
Jannat Patel c8f3350761 fix: creator patch 2023-01-17 12:27:32 +05:30
Jannat Patel e3112d8dcf fix: og tags 2023-01-16 17:53:54 +05:30
Jannat Patel 5009900c0e Merge pull request #469 from pateljannat/job-changes 2023-01-16 09:54:58 +05:30
Jannat Patel 0f60f1a58b fix: see on website link in job opportunity 2023-01-11 10:11:57 +05:30
Jannat Patel 8f88518187 Merge pull request #464 from pateljannat/people 2023-01-09 16:33:45 +05:30
Jannat Patel 05bcead7d1 fix: profile webform layout 2023-01-09 16:24:24 +05:30
Jannat Patel 6268989306 fix: user custom field positions 2023-01-09 12:51:33 +05:30
Jannat Patel 43ba835b52 fix: renamed community to people 2023-01-06 18:27:04 +05:30
Jannat Patel 9240bc9130 feat: card background 2023-01-05 13:25:59 +05:30
Jannat Patel fb70aee055 chore: fix pre-commit-config 2023-01-05 11:19:48 +05:30
Jannat Patel 7bf69eb77d chore: fix pre-commit-config 2023-01-05 11:18:32 +05:30
Jannat Patel 7ded9a23be Merge pull request #463 from pateljannat/user-singles-issue 2023-01-05 09:38:25 +05:30
Jannat Patel 281af15d65 fix: converted query to qb 2023-01-04 16:57:35 +05:30
Jannat Patel ec31c96120 fix: linters 2023-01-04 16:29:07 +05:30
Jannat Patel b970eb1541 fix: user doctype singles issue 2023-01-03 22:04:59 +05:30
Jannat Patel 7f6b90d5f4 Merge pull request #461 from NagariaHussain/fix-meta 2023-01-03 18:49:52 +05:30
Hussain Nagaria d28096ede6 Revert "feat: add meta image field in LMS course"
This reverts commit 37e8c3ab84.
2023-01-03 17:32:49 +05:30
Hussain Nagaria 12b2b0d0eb fix: linter 2023-01-03 17:01:00 +05:30
Hussain Nagaria a0e281fb30 feat(ux): add View in Website button in LMS Course 2023-01-03 16:52:50 +05:30
Hussain Nagaria 37e8c3ab84 feat: add meta image field in LMS course 2023-01-03 16:48:52 +05:30
Hussain Nagaria 16cb564a6a fix: render meta block in portal base pages 2023-01-03 16:48:16 +05:30
Jannat Patel cd88657bc9 Merge pull request #460 from pateljannat/readme 2022-12-30 18:11:42 +05:30
Jannat Patel d82a32b06a docs: grammar correction in readme 2022-12-30 18:03:01 +05:30
Jannat Patel 094bd943ee docs: updated screenshots in readme 2022-12-30 15:58:31 +05:30
472 changed files with 26587 additions and 7845 deletions
+46
View File
@@ -0,0 +1,46 @@
#!/bin/bash
set -e
cd ~ || exit
echo "Setting Up Bench..."
pip install frappe-bench
bench -v init frappe-bench --skip-assets --python "$(which python)"
cd ./frappe-bench || exit
bench -v setup requirements
echo "Setting Up LMS App..."
bench get-app lms "${GITHUB_WORKSPACE}"
echo "Setting Up Sites & Database..."
mkdir ~/frappe-bench/sites/lms.test
cp "${GITHUB_WORKSPACE}/.github/helper/site_config.json" ~/frappe-bench/sites/lms.test/site_config.json
mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "SET GLOBAL character_set_server = 'utf8mb4'";
mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'";
mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "CREATE DATABASE test_lms";
mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "CREATE USER 'test_lms'@'localhost' IDENTIFIED BY 'test_lms'";
mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "GRANT ALL PRIVILEGES ON \`test_lms\`.* TO 'test_lms'@'localhost'";
mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "FLUSH PRIVILEGES";
echo "Setting Up Procfile..."
sed -i 's/^watch:/# watch:/g' Procfile
sed -i 's/^schedule:/# schedule:/g' Procfile
echo "Starting Bench..."
bench start &> bench_start.log &
CI=Yes bench build &
build_pid=$!
bench --site lms.test reinstall --yes
bench --site lms.test install-app lms
wait $build_pid
+14
View File
@@ -0,0 +1,14 @@
#!/bin/bash
set -e
echo "Setting Up System Dependencies..."
sudo apt update
sudo apt remove mysql-server mysql-client
sudo apt install libcups2-dev redis-server mariadb-client-10.6
install_wkhtmltopdf() {
wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
sudo apt install ./wkhtmltox_0.12.6-1.focal_amd64.deb
}
install_wkhtmltopdf &
+20
View File
@@ -0,0 +1,20 @@
{
"db_host": "127.0.0.1",
"db_port": 3306,
"db_name": "test_lms",
"db_password": "test_lms",
"allow_tests": true,
"enable_ui_tests": true,
"db_type": "mariadb",
"auto_email_id": "test@example.com",
"mail_server": "smtp.example.com",
"mail_login": "test@example.com",
"mail_password": "test",
"admin_password": "admin",
"root_login": "root",
"root_password": "123",
"host_name": "http://lms.test:8000",
"monitor": 1,
"server_script_enabled": true,
"mute_emails": true
}
+32
View File
@@ -0,0 +1,32 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4 2 193 52">
<g filter="url(#filter0_dd)">
<rect x="4" y="2" width="193" height="52" rx="6" fill="#2490EF"/>
<path d="M28 22.2891H32.8786V35.5H36.2088V22.2891H41.0874V19.5H28V22.2891Z" fill="white"/>
<path d="M41.6982 35.5H45.0129V28.7109C45.0129 27.2344 46.0866 26.2188 47.5494 26.2188C48.0085 26.2188 48.6388 26.2969 48.95 26.3984V23.4453C48.6543 23.375 48.2419 23.3281 47.9074 23.3281C46.5691 23.3281 45.472 24.1094 45.0362 25.5938H44.9117V23.5H41.6982V35.5Z" fill="white"/>
<path d="M52.8331 40C55.2996 40 56.6068 38.7344 57.2837 36.7969L61.9289 23.5156L58.4197 23.5L55.9221 32.3125H55.7976L53.3233 23.5H49.8374L54.1247 35.8437L53.9302 36.3516C53.4944 37.4766 52.6619 37.5312 51.4947 37.1719L50.7478 39.6562C51.2224 39.8594 51.9927 40 52.8331 40Z" fill="white"/>
<path d="M73.6142 35.7344C77.2401 35.7344 79.4966 33.2422 79.4966 29.5469C79.4966 25.8281 77.2401 23.3438 73.6142 23.3438C69.9883 23.3438 67.7319 25.8281 67.7319 29.5469C67.7319 33.2422 69.9883 35.7344 73.6142 35.7344ZM73.6298 33.1562C71.9569 33.1562 71.101 31.6171 71.101 29.5233C71.101 27.4296 71.9569 25.8827 73.6298 25.8827C75.2715 25.8827 76.1274 27.4296 76.1274 29.5233C76.1274 31.6171 75.2715 33.1562 73.6298 33.1562Z" fill="white"/>
<path d="M84.7253 28.5625C84.7331 27.0156 85.6512 26.1094 86.9895 26.1094C88.3201 26.1094 89.1215 26.9844 89.1137 28.4531V35.5H92.4284V27.8594C92.4284 25.0625 90.7945 23.3438 88.3046 23.3438C86.5306 23.3438 85.2466 24.2187 84.7097 25.6172H84.5697V23.5H81.4106V35.5H84.7253V28.5625Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M102.429 19.5H113.429V22.3141H102.429V19.5ZM102.429 35.5V26.6794H112.699V29.4982H105.94V35.5H102.429Z" fill="white"/>
<path d="M131.584 24.9625C131.09 21.5057 128.345 19.5 124.785 19.5C120.589 19.5 117.429 22.463 117.429 27.4924C117.429 32.5142 120.55 35.4848 124.785 35.4848C128.604 35.4848 131.137 33.0916 131.584 30.1211L128.651 30.1059C128.282 31.9293 126.745 32.9549 124.824 32.9549C122.22 32.9549 120.354 31.0632 120.354 27.4924C120.354 23.9824 122.204 22.0299 124.832 22.0299C126.784 22.0299 128.314 23.1011 128.651 24.9625H131.584Z" fill="white"/>
<path d="M136.409 19.7124H133.571V35.2718H136.409V19.7124Z" fill="white"/>
<path d="M144.031 35.5001C147.56 35.5001 149.803 33.0917 149.803 29.483C149.803 25.8667 147.56 23.4507 144.031 23.4507C140.502 23.4507 138.259 25.8667 138.259 29.483C138.259 33.0917 140.502 35.5001 144.031 35.5001ZM144.047 33.2969C142.094 33.2969 141.137 31.6103 141.137 29.4754C141.137 27.3406 142.094 25.6312 144.047 25.6312C145.968 25.6312 146.925 27.3406 146.925 29.4754C146.925 31.6103 145.968 33.2969 144.047 33.2969Z" fill="white"/>
<path d="M159.338 30.3641C159.338 32.1419 158.028 33.0232 156.773 33.0232C155.409 33.0232 154.499 32.0887 154.499 30.6072V23.6025H151.66V31.0327C151.66 33.8361 153.307 35.4239 155.675 35.4239C157.479 35.4239 158.749 34.5046 159.298 33.1979H159.424V35.272H162.176V23.6025H159.338V30.3641Z" fill="white"/>
<path d="M169.014 35.4769C171.084 35.4769 172.017 34.2841 172.464 33.4332H172.637V35.2718H175.429V19.7124H172.582V25.532H172.464C172.033 24.6887 171.147 23.4503 169.022 23.4503C166.238 23.4503 164.05 25.5624 164.05 29.4522C164.05 33.2965 166.175 35.4769 169.014 35.4769ZM169.806 33.2205C167.931 33.2205 166.943 31.6251 166.943 29.437C166.943 27.2642 167.916 25.7067 169.806 25.7067C171.633 25.7067 172.637 27.173 172.637 29.437C172.637 31.701 171.617 33.2205 169.806 33.2205Z" fill="white"/>
</g>
<defs>
<filter id="filter0_dd" x="0" y="0" width="201" height="60" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset/>
<feGaussianBlur stdDeviation="0.25"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.13 0"/>
<feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/>
</filter>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

+3 -4
View File
@@ -1,4 +1,4 @@
name: Run tests
name: Server Tests
on:
push:
branches:
@@ -36,7 +36,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '18'
check-latest: true
- name: setup cache for bench
uses: actions/cache@v2
@@ -77,5 +77,4 @@ jobs:
run: bench --site frappe.local build
- name: run tests
working-directory: /home/runner/frappe-bench
run: bench --site frappe.local run-tests --app lms
run: bench --site frappe.local run-tests --app lms
+121
View File
@@ -0,0 +1,121 @@
name: UI
on:
pull_request:
workflow_dispatch:
push:
branches: [ main ]
permissions:
# Do not change this as GITHUB_TOKEN is being used by roulette
contents: read
jobs:
test:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'frappe' }}
timeout-minutes: 60
strategy:
fail-fast: false
name: UI Tests (Cypress)
services:
mariadb:
image: mariadb:10.6
env:
MARIADB_ROOT_PASSWORD: 123
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
steps:
- name: Clone
uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Check for valid Python & Merge Conflicts
run: |
python -m compileall -q -f "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
fi
- uses: actions/setup-node@v3
with:
node-version: 18
check-latest: true
- name: Add to Hosts
run: |
echo "127.0.0.1 lms.test" | sudo tee -a /etc/hosts
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-ui-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-ui-
- name: Cache cypress binary
uses: actions/cache@v3
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress
- name: Install Dependencies
run: |
bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
BEFORE: ${{ env.GITHUB_EVENT_PATH.before }}
AFTER: ${{ env.GITHUB_EVENT_PATH.after }}
TYPE: ui
DB: mariadb
- name: Site Setup
run: |
cd ~/frappe-bench/
bench --site lms.test execute frappe.utils.install.complete_setup_wizard
bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user
- name: cypress pre-requisites
run: |
cd ~/frappe-bench/apps/lms
yarn add cypress@^10 --no-lockfile
- name: UI Tests
run: cd ~/frappe-bench/ && bench --site lms.test run-ui-tests lms --headless
env:
CYPRESS_BASE_URL: http://lms.test:8000
CYPRESS_RECORD_KEY: 095366ec-7b9f-41bd-aeec-03bb76d627fe
- name: Stop server and wait for coverage file
run: |
ps -ef | grep "[f]rappe serve" | awk '{print $2}' | xargs kill -s SIGINT
sleep 5
- name: Show bench output
if: ${{ always() }}
run: cat ~/frappe-bench/bench_start.log || true
+4
View File
@@ -8,3 +8,7 @@ lms/public/dist
__pycache__/
*.py[cod]
*$py.class
node_modules
package-lock.json
lms/public/frontend
lms/www/lms.html
+2 -4
View File
@@ -7,11 +7,9 @@ repos:
rev: v4.3.0
hooks:
- id: trailing-whitespace
files: "frappe.*"
files: "lms.*"
exclude: ".*json$|.*txt$|.*csv|.*md|.*svg"
- id: check-yaml
- id: no-commit-to-branch
args: ['--branch', 'main']
- id: check-merge-conflict
- id: check-ast
- id: check-json
@@ -34,7 +32,7 @@ repos:
rev: v2.7.1
hooks:
- id: prettier
types_or: [javascript]
types_or: [javascript, vue]
# Ignore any files that might contain jinja / bundles
exclude: |
(?x)^(
+41 -24
View File
@@ -1,46 +1,64 @@
<p align="center">
<a href="https://www.frappelms.com/">
<img src="https://www.frappelms.com/files/flms.svg" alt="Frappe LMS" width="100" height="100">
<img src="https://frappe.io/files/lms.png" alt="Frappe LMS" width="50px" height="50px">
</a>
<p align="center">Easy to use, open source, Learning Management System</p>
<p align="center">Easy to use, open source, learning management system.</p>
</p>
&nbsp;
<p align="center">
<a href="https://www.producthunt.com/posts/frappe-lms?utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-frappe&#0045;lms" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=396079&theme=dark&period=weekly&topic_id=204" alt="Frappe&#0032;LMS - Easy&#0032;to&#0032;use&#0044;&#0032;100&#0037;&#0032;open&#0032;source&#0032;learning&#0032;management&#0032;system | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
</p>
<div align="center" style="max-height: 40px;">
<a href="https://frappecloud.com/lms/signup">
<img src=".github/try-on-f-cloud.svg" height="40">
</a>
</div>
&nbsp;
<p align="center">
<a href="https://dashboard.cypress.io/projects/vandxn/runs">
<img alt="cypress" src="https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress">
</a>
<a href="https://github.com/frappe/lms/blob/main/LICENSE">
<img alt="license" src="https://img.shields.io/badge/license-AGPLv3-blue">
</a>
</p>
<img width="1402" alt="Lesson" src="https://frappelms.com/files/fs-banner71f330.png">
<img width="1402" alt="Lesson" src="https://frappelms.com/files/banner.png">
<details>
<summary>Show more screenshots</summary>
![Screenshot 1](/lms/public/images/ss1.png)
![Screenshot 2](/lms/public/images/ss2.png)
![Screenshot 3](/lms/public/images/ss3.png)
<img width="1520" alt="ss1" src="https://user-images.githubusercontent.com/31363128/210056046-584bc8aa-d28c-4514-b031-73817012837d.png">
<img width="830" alt="ss2" src="https://user-images.githubusercontent.com/31363128/210056097-36849182-6db0-43a2-8c62-5333cd2aedf4.png">
<img width="941" alt="ss3" src="https://user-images.githubusercontent.com/31363128/210056134-01a7c429-1ef4-434e-9d43-128dda35d7e5.png">
</details>
Frappe LMS is an easy-to-use, open-source learning management system. You can use it to create and share online courses. The app has a clear UI that helps students focus only on what's important and assists in distraction-free learning.
You can create courses and lessons through simple forms. Lessons can be in the form of text, videos, quizzes or a combination of all these. You can keep your students engaged with quizzes to help revise and test the concepts learned.Course Instructors and Students can reach out to each other through the discussions section available for each lesson and get queries resolved.
You can create courses and lessons through simple forms. Lessons can be in the form of text, videos, quizzes or a combination of all these. You can keep your students engaged with quizzes to help revise and test the concepts learned. Course Instructors and Students can reach out to each other through the discussions section available for each lesson and get queries resolved.
## Features
- Create online courses. 📚
- Add detailed descriptions and preview video to the course. 🎬
- Add videos, quizzes and assignments to your lessons and make them interesting and interactive 📝
- Add detailed descriptions and preview videos to the course. 🎬
- Add videos, quizzes, and assignments to your lessons and make them interesting and interactive 📝
- Discussions section below each lesson where instructors and students can interact with each other. 💬
- Create classes to group your students based on courses and track their progress 🏛
- Create batches to group your students based on courses and track their progress 🏛
- Statistics dashboard that provides all important numbers at a glimpse. 📈
- Job Board where users can post and look for jobs. 💼
- People directory with each person's profile page 👨‍👩‍👧‍👦
- Set cover image, profile photo, short bio and other professional information. 🦹🏼‍♀️
- Set cover image, profile photo, short bio, and other professional information. 🦹🏼‍♀️
- Simple layout that optimizes readability 🤓
- Delightful user-experience in overall usage ✨
- Delightful user experience in overall usage ✨
## Tech Stack
Frappe LMS is built on [Frappe Framework](https://frappeframework.com) which is a batteries-included python web-framework.
Frappe LMS is built on [Frappe Framework](https://frappeframework.com) which is a batteries-included python web framework.
These are some of the tools it's built on:
- [Python](https://www.python.org)
- [Redis](https://redis.io/)
@@ -48,24 +66,23 @@ These are some of the tools it's built on:
- [Socket.io](https://socket.io/)
## Local Setup
### Docker
You need Docker, docker-compose and git setup on your machine. Refer [Docker documentation](https://docs.docker.com/). After that, run the following commands:
You need Docker, docker-compose, and git setup on your machine. Refer to [Docker documentation](https://docs.docker.com/). After that, run the following commands:
```
git clone https://github.com/frappe/lms
cd lms/docker
cd apps/lms/docker
docker-compose up
```
Wait for sometime until the setup script creates a site. After that you can
access `http://localhost:8000` in your browser and the app's login screen
should show up.
Wait for some time until the setup script creates a site. After that, you can access `http://localhost:8000` in your browser and the app's login screen should show up.
### Frappe Bench
Currently, this app depends on the `develop` branch of [frappe](https://github.com/frappe/frappe).
1. Setup frappe-bench by following [this guide](https://frappeframework.com/docs/v14/user/en/installation)
1. In the frappe-bench directory, run `bench start` and keep it running. Open a new terminal session and cd into `frappe-bench` directory.
1. In the frappe-bench directory, run `bench start` and keep it running. Open a new terminal session and cd into the `frappe-bench` directory.
1. Run the following commands:
```sh
bench new-site lms.test
@@ -73,16 +90,16 @@ Currently, this app depends on the `develop` branch of [frappe](https://github.c
bench --site lms.test install-app lms
bench --site lms.test add-to-hosts
1. Now, you can access the site at `http://gameplan.test:8080`
1. Now, you can access the site at `http://lms.test:8000`
## Deployment
Frappe LMS is an app built on top of Frappe Framework. So, you can follow any deployment guide for hosting a Frappe Framework based site.
Frappe LMS is an app built on top of the Frappe Framework. So, you can follow any deployment guide for hosting a Frappe Framework-based site.
### Managed Hosting
Frappe LMS can be deployed in a few clicks on [Frappe Cloud](https://frappecloud.com/marketplace/apps/lms).
### Self hosting
### Self-hosting
If you want to self-host, you can follow official [Frappe Bench Installation](https://github.com/frappe/bench#installation) instructions.
## Bugs and Feature Requests
+5
View File
@@ -0,0 +1,5 @@
# Security Policy
The Frappe team and community take security issues seriously. To report a security issue, please go through the information mentioned [here](https://frappe.io/security).
We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly and will keep you updated throughout the process.
+18
View File
@@ -0,0 +1,18 @@
const { defineConfig } = require("cypress");
module.exports = defineConfig({
projectId: "vandxn",
adminPassword: "admin",
testUser: "frappe@example.com",
defaultCommandTimeout: 20000,
pageLoadTimeout: 15000,
video: true,
videoUploadOnPasses: false,
retries: {
runMode: 2,
openMode: 0,
},
e2e: {
baseUrl: "http://pyp:8000",
},
});
+133
View File
@@ -0,0 +1,133 @@
describe("Course Creation", () => {
it("creates a new course", () => {
cy.login();
cy.visit("/courses");
// Create a course
cy.get("a.btn").contains("Create a Course").click();
cy.wait(1000);
cy.url().should("include", "/courses/new-course/edit");
cy.get("#title").type("Test Course");
cy.get("#intro").type("Test Course Short Introduction");
cy.get("#description").type("Test Course Description");
cy.get("#video-link").type("-LPmw2Znl2c");
cy.get("#tags-input").type("Test");
cy.get("#published").check();
cy.wait(1000);
cy.button("Save").click();
// Add Chapter
cy.wait(1000);
cy.link("Course Outline").click();
cy.wait(1000);
cy.get(".edit-header .btn-add-chapter").click();
cy.wait(500);
cy.get("#chapter-title").type("Test Chapter");
cy.get("#chapter-description").type("Test Chapter Description");
cy.button("Save").click();
// Add Lesson
cy.wait(1000);
cy.link("Add Lesson").click();
cy.wait(1000);
cy.get("#lesson-title").type("Test Lesson");
// Content
cy.get(".collapse-section.collapsed:first").click();
cy.get("#lesson-content .ce-block")
.click()
.type(
"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now. {enter}"
);
cy.get("#lesson-content .ce-toolbar__plus").click();
cy.get('#lesson-content [data-item-name="youtube"]').click();
cy.get('input[data-fieldname="youtube"]').type("GoDtyItReto");
cy.button("Insert").click();
cy.wait(1000);
cy.button("Save").click();
// View Course
cy.wait(1000);
cy.visit("/courses");
cy.get(".course-card-title:first").contains("Test Course");
cy.get(".course-card:first").click();
cy.url().should("include", "/courses/test-course");
cy.get("#title").contains("Test Course");
cy.get(".preview-video").should(
"have.attr",
"src",
"https://www.youtube.com/embed/-LPmw2Znl2c"
);
cy.get("#intro").contains("Test Course Short Introduction");
// View Chapter
cy.get(".chapter-title-main:first").contains("Test Chapter");
cy.get(".chapter-description:first").contains(
"Test Chapter Description"
);
cy.get(".lesson-info:first").contains("Test Lesson");
cy.get(".lesson-info:first").click();
// View Lesson
cy.wait(1000);
cy.url().should("include", "learn/1.1");
cy.get("#title").contains("Test Lesson");
cy.get(".lesson-video iframe").should(
"have.attr",
"src",
"https://www.youtube.com/embed/GoDtyItReto"
);
cy.get(".lesson-content-card").contains(
"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
);
// Add Discussion
cy.get(".reply").click();
cy.wait(500);
cy.get(".discussion-modal").should("be.visible");
// Enter title
cy.get(".modal .topic-title")
.type("Discussion from tests")
.should("have.value", "Discussion from tests");
// Enter comment
cy.get(".modal .discussions-comment").type(
"This is a discussion from the cypress ui tests."
);
// Submit
cy.get(".modal .submit-discussion").click();
cy.wait(2000);
// Check if discussion is added to page and content is visible
cy.get(".sidebar-parent:first .discussion-topic-title").should(
"have.text",
"Discussion from tests"
);
cy.get(".sidebar-parent:first .discussion-topic-title").click();
cy.get(".discussion-on-page:visible").should("have.class", "show");
cy.get(
".discussion-on-page:visible .reply-card .reply-text .ql-editor p"
).should(
"have.text",
"This is a discussion from the cypress ui tests."
);
cy.get(".discussion-form:visible .discussions-comment").type(
"This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page."
);
cy.get(".discussion-form:visible .submit-discussion").click();
cy.wait(3000);
cy.get(".discussion-on-page:visible").should("have.class", "show");
cy.get(".discussion-on-page:visible")
.children(".reply-card")
.eq(1)
.find(".reply-text")
.should(
"have.text",
"This is a discussion from the cypress ui tests. This comment was entered through the commentbox on the page.\n"
);
});
});
+5
View File
@@ -0,0 +1,5 @@
{
"name": "Using fixtures to represent data",
"email": "hello@cypress.io",
"body": "Fixtures are a great way to mock data for responses to routes"
}
+55
View File
@@ -0,0 +1,55 @@
// ***********************************************
// This example commands.js shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add('login', (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
Cypress.Commands.add("login", (email, password) => {
if (!email) {
email = Cypress.config("testUser") || "Administrator";
}
if (!password) {
password = Cypress.config("adminPassword");
}
cy.request({
url: "/api/method/login",
method: "POST",
body: { usr: email, pwd: password },
});
});
Cypress.Commands.add("button", (text) => {
return cy.get(`button:contains("${text}")`);
});
Cypress.Commands.add("link", (text) => {
return cy.get(`a:contains("${text}")`);
});
Cypress.Commands.add("iconButton", (text) => {
return cy.get(`button[aria-label="${text}"]`);
});
Cypress.Commands.add("dialog", (selector) => {
return cy.get(`[role=dialog] ${selector}`);
});
+20
View File
@@ -0,0 +1,20 @@
// ***********************************************************
// This example support/e2e.js is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************
// Import commands.js using ES2015 syntax:
import "./commands";
// Alternatively you can use CommonJS syntax:
// require('./commands')
+2
View File
@@ -4,6 +4,8 @@
$ git clone https://github.com/frappe/lms.git
$ cd lms
$ cd docker
```
**Step 2:** Run docker-compose
+3 -1
View File
@@ -8,6 +8,8 @@ else
echo "Creating new bench..."
fi
export PATH="${NVM_DIR}/versions/node/v${NODE_VERSION_DEVELOP}/bin/:${PATH}"
bench init --skip-redis-config-generation frappe-bench
cd frappe-bench
@@ -36,4 +38,4 @@ bench --site lms.localhost clear-cache
bench --site lms.localhost set-config mute_emails 1
bench use lms.localhost
bench start
bench start
Submodule
+1
Submodule frappe-ui added at c5faaae38e
+5
View File
@@ -0,0 +1,5 @@
node_modules
.DS_Store
dist
dist-ssr
*.local
+4
View File
@@ -0,0 +1,4 @@
{
"semi": false,
"singleQuote": true
}
+42
View File
@@ -0,0 +1,42 @@
# Frappe UI Starter
This template should help get you started developing custom frontend for Frappe
apps with Vue 3 and the Frappe UI package.
This boilerplate sets up Vue 3, Vue Router, TailwindCSS, and Frappe UI out of
the box.
## Usage
This template is meant to be cloned inside an existing Frappe App. Assuming your
apps name is `todo`. Clone this template in the root folder of your app using `degit`.
```
cd apps/todo
npx degit netchampfaris/frappe-ui-starter frontend
cd frontend
yarn
yarn dev
```
In a development environment, you need to put the below key-value pair in your `site_config.json` file:
```
"ignore_csrf": 1
```
This will prevent `CSRFToken` errors while using the vite dev server. In production environment, the `csrf_token` is attached to the `window` object in `index.html` for you.
The Vite dev server will start on the port `8080`. This can be changed from `vite.config.js`.
The development server is configured to proxy your frappe app (usually running on port `8000`). If you have a site named `todo.test`, open `http://todo.test:8080` in your browser. If you see a button named "Click to send 'ping' request", congratulations!
If you notice the browser URL is `/frontend`, this is the base URL where your frontend app will run in production.
To change this, open `src/router.js` and change the base URL passed to `createWebHistory`.
## Resources
- [Vue 3](https://v3.vuejs.org/guide/introduction.html)
- [Vue Router](https://next.router.vuejs.org/guide/)
- [Frappe UI](https://github.com/frappe/frappe-ui)
- [TailwindCSS](https://tailwindcss.com/docs/utility-first)
- [Vite](https://vitejs.dev/guide/)
+49
View File
@@ -0,0 +1,49 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Frappe Learning</title>
<meta name="title" content="{{ meta.title }}" />
<meta name="image" content="{{ meta.image }}" />
<meta name="description" content="{{ meta.description }}" />
<meta name="keywords" content="{{ meta.keywords }}" />
<meta property="og:title" content="{{ meta.title }}" />
<meta property="og:image" content="{{ meta.image }}" />
<meta property="og:description" content="{{ meta.description }}" />
<meta name="twitter:title" content="{{ meta.title }}" />
<meta name="twitter:image" content="{{ meta.image }}" />
<meta name="twitter:description" content="{{ meta.description }}" />
</head>
<body>
<div id="app">
<div id="seo-content">
<h1>{{ meta.title }}</h1>
<p>
{{ meta.description }}
</p>
<p>
The content here is just for seo purposes. The actual content will be loaded in a few seconds.
</p>
<p>
Seo checks if a page has more than 300 words. So, here are some more words to make it more than 300 words.
Page descriptions are the HTML meta tags that provide a brief summary of a web page.
Search engines use meta descriptions to help identify the page's topic - they don't use them to rank the page, but they do use them to determine whether or not to display the page in search results.
Meta descriptions are important because they're often the first thing people see when they're deciding which search result to click on.
They're also important because they can help improve your click-through rate (CTR) from search results.
A good meta description can entice people to click on your page instead of someone else's.
</p>
<a href="{{ meta.link }}">Know More</a>
</div>
</div>
<div id="modals"></div>
<div id="popovers"></div>
<script>
window.csrf_token = '{{ csrf_token }}'
document.getElementById('seo-content').style.display = 'none';
</script>
<script type="module" src="/src/main.js"></script>
</body>
</html>
+38
View File
@@ -0,0 +1,38 @@
{
"name": "frappe-ui-frontend",
"private": true,
"version": "0.0.0",
"scripts": {
"dev": "vite",
"serve": "vite preview",
"build": "vite build --base=/assets/lms/frontend/ && yarn copy-html-entry",
"copy-html-entry": "cp ../lms/public/frontend/index.html ../lms/www/lms.html"
},
"dependencies": {
"@editorjs/checklist": "^1.6.0",
"@editorjs/editorjs": "^2.29.0",
"@editorjs/embed": "^2.7.0",
"@editorjs/header": "^2.8.1",
"@editorjs/image": "^2.9.0",
"@editorjs/nested-list": "^1.4.2",
"@editorjs/paragraph": "^2.11.3",
"chart.js": "^4.4.1",
"dayjs": "^1.11.6",
"feather-icons": "^4.28.0",
"frappe-ui": "^0.1.50",
"lucide-vue-next": "^0.309.0",
"markdown-it": "^14.0.0",
"pinia": "^2.0.33",
"socket.io-client": "^4.7.2",
"tailwindcss": "^3.3.3",
"vue": "^3.2.25",
"vue-chartjs": "^5.3.0",
"vue-router": "^4.0.12"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.3",
"autoprefixer": "^10.4.2",
"postcss": "^8.4.5",
"vite": "^5.0.11"
}
}
+6
View File
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

+25
View File
@@ -0,0 +1,25 @@
<template>
<Layout>
<router-view />
</Layout>
<Dialogs />
<Toasts />
</template>
<script setup>
import { Toasts } from 'frappe-ui'
import { Dialogs } from '@/utils/dialogs'
import { computed, defineAsyncComponent } from 'vue'
import { useScreenSize } from './utils/composables'
import DesktopLayout from './components/DesktopLayout.vue'
import MobileLayout from './components/MobileLayout.vue'
const screenSize = useScreenSize()
const Layout = computed(() => {
if (screenSize.width < 640) {
return MobileLayout
} else {
return DesktopLayout
}
})
</script>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+152
View File
@@ -0,0 +1,152 @@
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 100;
font-display: swap;
src: url("Inter-Thin.woff2?v=3.12") format("woff2"),
url("Inter-Thin.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 100;
font-display: swap;
src: url("Inter-ThinItalic.woff2?v=3.12") format("woff2"),
url("Inter-ThinItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 200;
font-display: swap;
src: url("Inter-ExtraLight.woff2?v=3.12") format("woff2"),
url("Inter-ExtraLight.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 200;
font-display: swap;
src: url("Inter-ExtraLightItalic.woff2?v=3.12") format("woff2"),
url("Inter-ExtraLightItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
font-display: swap;
src: url("Inter-Light.woff2?v=3.12") format("woff2"),
url("Inter-Light.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 300;
font-display: swap;
src: url("Inter-LightItalic.woff2?v=3.12") format("woff2"),
url("Inter-LightItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("Inter-Regular.woff2?v=3.12") format("woff2"),
url("Inter-Regular.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 400;
font-display: swap;
src: url("Inter-Italic.woff2?v=3.12") format("woff2"),
url("Inter-Italic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
font-display: swap;
src: url("Inter-Medium.woff2?v=3.12") format("woff2"),
url("Inter-Medium.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 500;
font-display: swap;
src: url("Inter-MediumItalic.woff2?v=3.12") format("woff2"),
url("Inter-MediumItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
font-display: swap;
src: url("Inter-SemiBold.woff2?v=3.12") format("woff2"),
url("Inter-SemiBold.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 600;
font-display: swap;
src: url("Inter-SemiBoldItalic.woff2?v=3.12") format("woff2"),
url("Inter-SemiBoldItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
font-display: swap;
src: url("Inter-Bold.woff2?v=3.12") format("woff2"),
url("Inter-Bold.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 700;
font-display: swap;
src: url("Inter-BoldItalic.woff2?v=3.12") format("woff2"),
url("Inter-BoldItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 800;
font-display: swap;
src: url("Inter-ExtraBold.woff2?v=3.12") format("woff2"),
url("Inter-ExtraBold.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 800;
font-display: swap;
src: url("Inter-ExtraBoldItalic.woff2?v=3.12") format("woff2"),
url("Inter-ExtraBoldItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 900;
font-display: swap;
src: url("Inter-Black.woff2?v=3.12") format("woff2"),
url("Inter-Black.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 900;
font-display: swap;
src: url("Inter-BlackItalic.woff2?v=3.12") format("woff2"),
url("Inter-BlackItalic.woff?v=3.12") format("woff");
}
+62
View File
@@ -0,0 +1,62 @@
<template>
<div v-if="communications.data?.length">
<div v-for="comm in communications.data">
<div class="mb-8">
<div class="flex items-center justify-between mb-2">
<div class="flex items-center">
<Avatar :label="comm.sender_full_name" size="lg" />
<div class="ml-2">
{{ comm.sender_full_name }}
</div>
</div>
<div class="text-sm">
{{ timeAgo(comm.communication_date) }}
</div>
</div>
<div
class="prose prose-sm bg-gray-50 !min-w-full px-4 py-2 rounded-md"
v-html="comm.content"
></div>
</div>
</div>
</div>
<div v-else class="text-sm italic text-gray-600">
{{ __('No announcements') }}
</div>
</template>
<script setup>
import { createListResource, Avatar } from 'frappe-ui'
import { timeAgo } from '@/utils'
const props = defineProps({
batch: {
type: String,
required: true,
},
})
const communications = createListResource({
doctype: 'Communication',
fields: [
'subject',
'content',
'recipients',
'cc',
'communication_date',
'sender',
'sender_full_name',
],
filters: {
reference_doctype: 'LMS Batch',
reference_name: props.batch,
},
orderBy: 'communication_date desc',
auto: true,
cache: ['batch', props.batch],
})
</script>
<style>
.prose-sm p {
margin: 0 0 0.5rem;
}
</style>
+55
View File
@@ -0,0 +1,55 @@
<template>
<div
class="flex h-full flex-col justify-between transition-all duration-300 ease-in-out bg-gray-50"
:class="isSidebarCollapsed ? 'w-14' : 'w-56'"
>
<div
class="flex flex-col overflow-hidden"
:class="isSidebarCollapsed ? 'items-center' : ''"
>
<UserDropdown class="p-2" :isCollapsed="isSidebarCollapsed" />
<div class="flex flex-col overflow-y-auto">
<SidebarLink
v-for="link in links"
:link="link"
:isCollapsed="isSidebarCollapsed"
class="mx-2 my-0.5"
/>
</div>
</div>
<SidebarLink
:link="{
label: isSidebarCollapsed ? 'Expand' : 'Collapse',
}"
:isCollapsed="isSidebarCollapsed"
@click="isSidebarCollapsed = !isSidebarCollapsed"
class="m-2"
>
<template #icon>
<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
<CollapseSidebar
class="h-4.5 w-4.5 text-gray-700 duration-300 ease-in-out"
:class="{ '[transform:rotateY(180deg)]': isSidebarCollapsed }"
/>
</span>
</template>
</SidebarLink>
</div>
</template>
<script setup>
import UserDropdown from '@/components/UserDropdown.vue'
import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
import SidebarLink from '@/components/SidebarLink.vue'
import { useStorage } from '@vueuse/core'
import { ref } from 'vue'
import { getSidebarLinks } from '../utils'
const links = getSidebarLinks()
const getSidebarFromStorage = () => {
return useStorage('sidebar_is_collapsed', false)
}
let isSidebarCollapsed = ref(getSidebarFromStorage())
</script>
+98
View File
@@ -0,0 +1,98 @@
<template>
<div>
<div class="text-lg font-semibold mb-4">
{{ __('Assessments') }}
</div>
<div v-if="assessments.data?.length">
<ListView
:columns="getAssessmentColumns()"
:rows="assessments.data"
row-key="name"
:options="{
selectable: false,
showTooltip: false,
getRowRoute: (row) => {
if (row.submission) {
return {
name: 'AssignmentSubmission',
params: {
assignmentName: row.assessment_name,
submissionName: row.submission.name,
},
}
} else {
return {
name: 'AssignmentSubmission',
params: {
assignmentName: row.assessment_name,
submissionName: 'new',
},
}
}
},
}"
>
</ListView>
</div>
<div v-else class="text-sm italic text-gray-600">
{{ __('No Assessments') }}
</div>
</div>
</template>
<script setup>
import { ListView, createResource } from 'frappe-ui'
import { inject } from 'vue'
const user = inject('$user')
const props = defineProps({
batch: {
type: String,
required: true,
},
rows: {
type: Array,
},
columns: {
type: Array,
},
options: {
type: Object,
default: () => ({
selectable: true,
totalCount: 0,
rowCount: 0,
}),
},
})
const assessments = createResource({
url: 'lms.lms.utils.get_assessments',
params: {
batch: props.batch,
},
auto: true,
})
const getAssessmentColumns = () => {
let columns = [
{
label: 'Assessment',
key: 'title',
},
{
label: 'Type',
key: 'assessment_type',
},
]
if (!user.data?.is_moderator) {
columns.push({
label: 'Status/Score',
key: 'status',
align: 'center',
})
}
return columns
}
</script>
+75
View File
@@ -0,0 +1,75 @@
<template>
<div
class="flex flex-col border border-gray-200 rounded-md p-4 h-full"
style="min-height: 150px"
>
<Badge
v-if="batch.seat_count && batch.seats_left > 0"
theme="green"
class="self-start mb-2"
>
{{ batch.seats_left }} {{ __('Seat Left') }}
</Badge>
<Badge
v-else-if="batch.seat_count && batch.seats_left <= 0"
theme="red"
class="self-start mb-2"
>
{{ __('Sold Out') }}
</Badge>
<div class="text-xl font-semibold mb-1">
{{ batch.title }}
</div>
<div class="short-introduction">
{{ batch.description }}
</div>
<div class="mt-auto">
<div v-if="batch.amount" class="font-semibold text-lg mb-4">
{{ batch.price }}
</div>
<div class="flex items-center mb-3">
<BookOpen class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span> {{ batch.courses.length }} {{ __('Courses') }} </span>
</div>
<div class="flex items-center mb-3">
<Calendar class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ dayjs(batch.start_date).format('DD MMM YYYY') }} -
{{ dayjs(batch.end_date).format('DD MMM YYYY') }}
</span>
</div>
<div class="flex items-center">
<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ formatTime(batch.start_time) }} - {{ formatTime(batch.end_time) }}
</span>
</div>
</div>
</div>
</template>
<script setup>
import { Calendar, Clock, BookOpen } from 'lucide-vue-next'
import { inject } from 'vue'
import { Badge } from 'frappe-ui'
import { formatTime } from '../utils'
const dayjs = inject('$dayjs')
const props = defineProps({
batch: {
type: Object,
default: null,
},
})
</script>
<style>
.short-introduction {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
width: 100%;
overflow: hidden;
margin: 0.25rem 0 1.25rem;
line-height: 1.5;
}
</style>
+141
View File
@@ -0,0 +1,141 @@
<template>
<div>
<div class="flex items-center justify-between mb-4">
<div class="text-xl font-semibold">
{{ __('Courses') }}
</div>
<Button
v-if="user.data?.is_moderator"
variant="solid"
@click="openCourseModal()"
>
<template #prefix>
<Plus class="h-4 w-4" />
</template>
{{ __('Add Course') }}
</Button>
</div>
<div v-if="courses.data?.length">
<ListView
:columns="getCoursesColumns()"
:rows="courses.data"
row-key="name"
:options="{ showTooltip: false }"
>
<ListHeader
class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
>
<ListHeaderItem :item="item" v-for="item in getCoursesColumns()">
<template #prefix="{ item }">
<component
v-if="item.icon"
:is="item.icon"
class="h-4 w-4 stroke-1.5 ml-4"
/>
</template>
</ListHeaderItem>
</ListHeader>
<ListRows>
<ListRow :row="row" v-for="row in courses.data">
<template #default="{ column, item }">
<ListRowItem :item="row[column.key]" :align="column.align">
<div>
{{ row[column.key] }}
</div>
</ListRowItem>
</template>
</ListRow>
</ListRows>
<ListSelectBanner>
<template #actions="{ unselectAll, selections }">
<div class="flex gap-2">
<Button variant="ghost" @click="removeCourses(selections)">
<Trash2 class="h-4 w-4 stroke-1.5" />
</Button>
</div>
</template>
</ListSelectBanner>
</ListView>
</div>
<BatchCourseModal
v-model="showCourseModal"
:batch="batch"
v-model:courses="courses"
/>
</div>
</template>
<script setup>
import { ref, inject } from 'vue'
import BatchCourseModal from '@/components/Modals/BatchCourseModal.vue'
import {
createResource,
Button,
ListHeader,
ListHeaderItem,
ListSelectBanner,
ListRow,
ListRows,
ListView,
ListRowItem,
} from 'frappe-ui'
import { Plus, Trash2 } from 'lucide-vue-next'
const showCourseModal = ref(false)
const user = inject('$user')
const props = defineProps({
batch: {
type: String,
required: true,
},
})
const courses = createResource({
url: 'lms.lms.utils.get_batch_courses',
params: {
batch: props.batch,
},
cache: ['batchCourses', props.batchName],
auto: true,
})
const openCourseModal = () => {
showCourseModal.value = true
}
const getCoursesColumns = () => {
return [
{
label: 'Title',
key: 'title',
},
{
label: 'Lessons',
key: 'lesson_count',
},
{
label: 'Enrollments',
key: 'enrollment_count',
},
]
}
const removeCourse = createResource({
url: 'frappe.client.delete',
makeParams(values) {
return {
doctype: 'Batch Course',
name: values.course,
}
},
})
const removeCourses = (selections) => {
console.log(selections)
selections.forEach(async (course) => {
removeCourse.submit({ course })
await setTimeout(1000)
})
courses.reload()
}
</script>
@@ -0,0 +1,26 @@
<template>
<div>
<UpcomingEvaluations
:batch="batch.data.name"
:endDate="batch.data.evaluation_end_date"
:courses="batch.data.courses"
:isStudent="isStudent"
/>
<Assessments :batch="batch.data.name" />
</div>
</template>
<script setup>
import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'
import Assessments from '@/components/Assessments.vue'
const props = defineProps({
batch: {
type: Object,
default: null,
},
isStudent: {
type: Boolean,
default: false,
},
})
</script>
+115
View File
@@ -0,0 +1,115 @@
<template>
<div v-if="batch.data" class="shadow rounded-md p-5" style="width: 300px">
<Badge
v-if="batch.data.seat_count && seats_left > 0"
theme="green"
class="self-start mb-2 float-right"
>
{{ seats_left }} {{ __('Seat Left') }}
</Badge>
<Badge
v-else-if="batch.data.seat_count && seats_left <= 0"
theme="red"
class="self-start mb-2 float-right"
>
{{ __('Sold Out') }}
</Badge>
<div v-if="batch.data.amount" class="text-lg font-semibold mb-3">
{{ formatNumberIntoCurrency(batch.data.amount, batch.data.currency) }}
</div>
<div class="flex items-center mb-3">
<BookOpen class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span> {{ batch.data.courses.length }} {{ __('Courses') }} </span>
</div>
<div class="flex items-center mb-3">
<Calendar class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ dayjs(batch.data.start_date).format('DD MMM YYYY') }} -
{{ dayjs(batch.data.end_date).format('DD MMM YYYY') }}
</span>
</div>
<div class="flex items-center">
<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
<span>
{{ formatTime(batch.data.start_time) }} -
{{ formatTime(batch.data.end_time) }}
</span>
</div>
<router-link
v-if="user?.data?.is_moderator"
:to="{
name: 'Batch',
params: {
batchName: batch.data.name,
},
}"
>
<Button variant="solid" class="w-full mt-4">
<span>
{{ __('Manage Batch') }}
</span>
</Button>
</router-link>
<router-link
:to="{
name: 'Billing',
params: {
type: 'batch',
name: batch.data.name,
},
}"
v-else-if="batch.data.paid_batch"
>
<Button class="w-full mt-4" variant="solid">
<span>
{{ __('Register Now') }}
</span>
</Button>
</router-link>
<Button
variant="solid"
class="w-full mt-2"
v-else-if="batch.data.allow_self_enrollment"
>
{{ __('Enroll Now') }}
</Button>
<router-link
v-if="user?.data?.is_moderator"
:to="{
name: 'BatchCreation',
params: {
batchName: batch.data.name,
},
}"
>
<Button class="w-full mt-2">
<span>
{{ __('Edit') }}
</span>
</Button>
</router-link>
</div>
</template>
<script setup>
import { formatNumberIntoCurrency, formatTime } from '@/utils'
import { BookOpen, Calendar, Clock } from 'lucide-vue-next'
import { inject, computed } from 'vue'
import { Badge, Button } from 'frappe-ui'
const dayjs = inject('$dayjs')
const user = inject('$user')
const props = defineProps({
batch: {
type: Object,
default: null,
},
})
const seats_left = computed(() => {
if (props.batch.data?.seat_count) {
return props.batch.data?.seat_count - props.batch.data?.students?.length
}
return null
})
</script>
+151
View File
@@ -0,0 +1,151 @@
<template>
<Button class="float-right mb-3" variant="solid" @click="openStudentModal()">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
{{ __('Add Student') }}
</Button>
<div class="text-lg font-semibold mb-4">
{{ __('Students') }}
</div>
<div v-if="students.data?.length">
<ListView
:columns="getStudentColumns()"
:rows="students.data"
row-key="name"
:options="{ showTooltip: false }"
>
<ListHeader
class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
>
<ListHeaderItem :item="item" v-for="item in getStudentColumns()">
<template #prefix="{ item }">
<component
v-if="item.icon"
:is="item.icon"
class="h-4 w-4 stroke-1.5 ml-4"
/>
</template>
</ListHeaderItem>
</ListHeader>
<ListRows>
<ListRow :row="row" v-for="row in students.data">
<template #default="{ column, item }">
<ListRowItem :item="row[column.key]" :align="column.align">
<template #prefix>
<div v-if="column.key == 'full_name'">
<Avatar
class="flex items-center"
:image="row['user_image']"
:label="item"
size="sm"
/>
</div>
</template>
<div>
{{ row[column.key] }}
</div>
</ListRowItem>
</template>
</ListRow>
</ListRows>
<ListSelectBanner>
<template #actions="{ unselectAll, selections }">
<div class="flex gap-2">
<Button variant="ghost" @click="removeStudents(selections)">
<Trash2 class="h-4 w-4 stroke-1.5" />
</Button>
</div>
</template>
</ListSelectBanner>
</ListView>
</div>
<div v-else class="text-sm italic text-gray-600">
{{ __('There are no students in this batch.') }}
</div>
<StudentModal
:batch="props.batch"
v-model="showStudentModal"
v-model:reloadStudents="students"
/>
</template>
<script setup>
import {
createResource,
ListHeader,
ListHeaderItem,
ListSelectBanner,
ListRow,
ListRows,
ListView,
ListRowItem,
Avatar,
Button,
} from 'frappe-ui'
import { Trash2, Plus } from 'lucide-vue-next'
import { ref } from 'vue'
import StudentModal from '@/components/Modals/StudentModal.vue'
const showStudentModal = ref(false)
const props = defineProps({
batch: {
type: String,
default: null,
},
})
const students = createResource({
url: 'lms.lms.utils.get_batch_students',
cache: ['students', props.batch],
params: {
batch: props.batch,
},
auto: true,
})
const getStudentColumns = () => {
return [
{
label: 'Full Name',
key: 'full_name',
},
{
label: 'Courses Done',
key: 'courses_completed',
align: 'center',
},
{
label: 'Assessments Done',
key: 'assessments_completed',
align: 'center',
},
{
label: 'Last Active',
key: 'last_active',
},
]
}
const openStudentModal = () => {
showStudentModal.value = true
}
const removeStudent = createResource({
url: 'frappe.client.delete',
makeParams(values) {
return {
doctype: 'Batch Student',
name: values.student,
}
},
})
const removeStudents = (selections) => {
selections.forEach(async (student) => {
removeStudent.submit({ student })
await setTimeout(1000)
})
students.reload()
}
</script>
@@ -0,0 +1,277 @@
<template>
<Combobox v-model="selectedValue" nullable v-slot="{ open: isComboboxOpen }">
<Popover class="w-full" v-model:show="showOptions">
<template #target="{ open: openPopover, togglePopover }">
<slot name="target" v-bind="{ open: openPopover, togglePopover }">
<div class="w-full">
<button
class="flex w-full items-center justify-between focus:outline-none"
:class="inputClasses"
@click="() => togglePopover()"
>
<div class="flex items-center">
<slot name="prefix" />
<span
class="overflow-hidden text-ellipsis whitespace-nowrap text-base leading-5"
v-if="selectedValue"
>
{{ displayValue(selectedValue) }}
</span>
<span class="text-base leading-5 text-gray-500" v-else>
{{ placeholder || '' }}
</span>
</div>
<ChevronDown class="h-4 w-4 stroke-1.5" />
</button>
</div>
</slot>
</template>
<template #body="{ isOpen }">
<div v-show="isOpen">
<div class="mt-1 rounded-lg bg-white py-1 text-base shadow-2xl">
<div class="relative px-1.5 pt-0.5">
<ComboboxInput
ref="search"
class="form-input w-full"
type="text"
@change="
(e) => {
query = e.target.value
}
"
:value="query"
autocomplete="off"
placeholder="Search"
/>
<button
class="absolute right-1.5 inline-flex h-7 w-7 items-center justify-center"
@click="selectedValue = null"
>
<X class="h-4 w-4 stroke-1.5" />
</button>
</div>
<ComboboxOptions
class="my-1 max-h-[12rem] overflow-y-auto px-1.5"
static
>
<div
class="mt-1.5"
v-for="group in groups"
:key="group.key"
v-show="group.items.length > 0"
>
<div
v-if="group.group && !group.hideLabel"
class="px-2.5 py-1.5 text-sm font-medium text-gray-500"
>
{{ group.group }}
</div>
<ComboboxOption
as="template"
v-for="option in group.items"
:key="option.value"
:value="option"
v-slot="{ active, selected }"
>
<li
:class="[
'flex items-center rounded px-2.5 py-1.5 text-base',
{ 'bg-gray-100': active },
]"
>
<slot
name="item-prefix"
v-bind="{ active, selected, option }"
/>
<slot
name="item-label"
v-bind="{ active, selected, option }"
>
{{ option.label }}
</slot>
</li>
</ComboboxOption>
</div>
<li
v-if="groups.length == 0"
class="mt-1.5 rounded-md px-2.5 py-1.5 text-base text-gray-600"
>
No results found
</li>
</ComboboxOptions>
<div v-if="slots.footer" class="border-t p-1.5 pb-0.5">
<slot
name="footer"
v-bind="{ value: search?.el._value, close }"
></slot>
</div>
</div>
</div>
</template>
</Popover>
</Combobox>
</template>
<script setup>
import {
Combobox,
ComboboxInput,
ComboboxOptions,
ComboboxOption,
} from '@headlessui/vue'
import { Popover, Button } from 'frappe-ui'
import { ChevronDown, X } from 'lucide-vue-next'
import { ref, computed, useAttrs, useSlots, watch, nextTick } from 'vue'
const props = defineProps({
modelValue: {
type: String,
default: '',
},
options: {
type: Array,
default: () => [],
},
size: {
type: String,
default: 'md',
},
variant: {
type: String,
default: 'subtle',
},
placeholder: {
type: String,
default: '',
},
disabled: {
type: Boolean,
default: false,
},
filterable: {
type: Boolean,
default: true,
},
})
const emit = defineEmits(['update:modelValue', 'update:query', 'change'])
const query = ref('')
const showOptions = ref(false)
const search = ref(null)
const attrs = useAttrs()
const slots = useSlots()
const valuePropPassed = computed(() => 'value' in attrs)
const selectedValue = computed({
get() {
return valuePropPassed.value ? attrs.value : props.modelValue
},
set(val) {
query.value = ''
if (val) {
showOptions.value = false
}
emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
},
})
function close() {
showOptions.value = false
}
const groups = computed(() => {
if (!props.options || props.options.length == 0) return []
let groups = props.options[0]?.group
? props.options
: [{ group: '', items: props.options }]
return groups
.map((group, i) => {
return {
key: i,
group: group.group,
hideLabel: group.hideLabel || false,
items: props.filterable ? filterOptions(group.items) : group.items,
}
})
.filter((group) => group.items.length > 0)
})
function filterOptions(options) {
if (!query.value) {
return options
}
return options.filter((option) => {
let searchTexts = [option.label, option.value]
return searchTexts.some((text) =>
(text || '').toString().toLowerCase().includes(query.value.toLowerCase())
)
})
}
function displayValue(option) {
if (typeof option === 'string') {
let allOptions = groups.value.flatMap((group) => group.items)
let selectedOption = allOptions.find((o) => o.value === option)
return selectedOption?.label || option
}
return option?.label
}
watch(query, (q) => {
emit('update:query', q)
})
watch(showOptions, (val) => {
if (val) {
nextTick(() => {
search.value.el.focus()
})
}
})
const textColor = computed(() => {
return props.disabled ? 'text-gray-600' : 'text-gray-800'
})
const inputClasses = computed(() => {
let sizeClasses = {
sm: 'text-base rounded h-7',
md: 'text-base rounded h-8',
lg: 'text-lg rounded-md h-10',
xl: 'text-xl rounded-md h-10',
}[props.size]
let paddingClasses = {
sm: 'py-1.5 px-2',
md: 'py-1.5 px-2.5',
lg: 'py-1.5 px-3',
xl: 'py-1.5 px-3',
}[props.size]
let variant = props.disabled ? 'disabled' : props.variant
let variantClasses = {
subtle:
'border border-gray-100 bg-gray-100 placeholder-gray-500 hover:border-gray-200 hover:bg-gray-200 focus:bg-white focus:border-gray-500 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-gray-400',
outline:
'border border-gray-300 bg-white placeholder-gray-500 hover:border-gray-400 hover:shadow-sm focus:bg-white focus:border-gray-500 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-gray-400',
disabled: [
'border bg-gray-50 placeholder-gray-400',
props.variant === 'outline' ? 'border-gray-300' : 'border-transparent',
],
}[variant]
return [
sizeClasses,
paddingClasses,
variantClasses,
textColor.value,
'transition-colors w-full',
]
})
defineExpose({ query })
</script>
+146
View File
@@ -0,0 +1,146 @@
<template>
<div class="space-y-1.5">
<label class="block" :class="labelClasses" v-if="attrs.label">
{{ attrs.label }}
</label>
<Autocomplete
ref="autocomplete"
:options="options.data"
v-model="value"
:size="attrs.size || 'sm'"
:variant="attrs.variant"
:placeholder="attrs.placeholder"
:filterable="false"
>
<template #target="{ open, togglePopover }">
<slot name="target" v-bind="{ open, togglePopover }" />
</template>
<template #prefix>
<slot name="prefix" />
</template>
<template #item-prefix="{ active, selected, option }">
<slot name="item-prefix" v-bind="{ active, selected, option }" />
</template>
<template #item-label="{ active, selected, option }">
<slot name="item-label" v-bind="{ active, selected, option }" />
</template>
<template v-if="attrs.onCreate" #footer="{ value, close }">
<div>
<Button
variant="ghost"
class="w-full !justify-start"
label="Create New"
@click="attrs.onCreate(value, close)"
>
<template #prefix>
<Plus class="h-4 w-4 stroke-1.5" />
</template>
</Button>
</div>
</template>
</Autocomplete>
</div>
</template>
<script setup>
import Autocomplete from '@/components/Controls/Autocomplete.vue'
import { watchDebounced } from '@vueuse/core'
import { createResource, Button } from 'frappe-ui'
import { Plus } from 'lucide-vue-next'
import { useAttrs, computed, ref } from 'vue'
const props = defineProps({
doctype: {
type: String,
required: true,
},
filters: {
type: Object,
default: () => ({}),
},
modelValue: {
type: String,
default: '',
},
})
const emit = defineEmits(['update:modelValue', 'change'])
const attrs = useAttrs()
const valuePropPassed = computed(() => 'value' in attrs)
const value = computed({
get: () => (valuePropPassed.value ? attrs.value : props.modelValue),
set: (val) => {
return (
val?.value &&
emit(valuePropPassed.value ? 'change' : 'update:modelValue', val?.value)
)
},
})
const autocomplete = ref(null)
const text = ref('')
watchDebounced(
() => autocomplete.value?.query,
(val) => {
val = val || ''
if (text.value === val) return
text.value = val
reload(val)
},
{ debounce: 300, immediate: true }
)
watchDebounced(
() => props.doctype,
() => reload(''),
{ debounce: 300, immediate: true }
)
const options = createResource({
url: 'frappe.desk.search.search_link',
cache: [props.doctype, text.value],
method: 'POST',
params: {
txt: text.value,
doctype: props.doctype,
filters: props.filters,
},
transform: (data) => {
return data.map((option) => {
return {
label: option.value,
value: option.value,
}
})
},
})
function reload(val) {
options.update({
params: {
txt: val,
doctype: props.doctype,
filters: props.filters,
},
})
options.reload()
}
const labelClasses = computed(() => {
return [
{
sm: 'text-xs',
md: 'text-base',
}[attrs.size || 'sm'],
'text-gray-600',
]
})
</script>
@@ -0,0 +1,38 @@
<template>
<div class="flex text-center">
<div v-for="index in 5">
<Star
:class="index <= rating ? 'fill-orange-500' : ''"
class="h-6 w-6 fill-gray-400 text-gray-50 mr-1 cursor-pointer"
@click="markRating(index)"
/>
</div>
</div>
</template>
<script setup>
import { Star } from 'lucide-vue-next'
import { ref } from 'vue'
const props = defineProps({
id: {
type: String,
default: '',
},
modelValue: {
type: Number,
default: 0,
},
})
const emit = defineEmits(['update:modelValue'])
let rating = ref(props.modelValue)
let emitChange = (value) => {
emit('update:modelValue', value)
}
function markRating(index) {
emitChange(index)
rating.value = index
}
</script>
+187
View File
@@ -0,0 +1,187 @@
<template>
<div
v-if="course.title"
class="flex flex-col h-full rounded-md shadow-md text-base overflow-auto"
style="min-height: 320px"
>
<div
class="course-image"
:class="{ 'default-image': !course.image }"
:style="{ backgroundImage: 'url(' + encodeURI(course.image) + ')' }"
>
<div class="flex relative top-4 left-4 w-fit flex-wrap">
<Badge theme="gray" size="md" class="mr-2" v-for="tag in course.tags">
{{ tag }}
</Badge>
</div>
<div v-if="!course.image" class="image-placeholder">
{{ course.title[0] }}
</div>
</div>
<div class="flex flex-col flex-auto p-4">
<div class="flex items-center justify-between mb-2">
<div v-if="course.lesson_count">
<Tooltip :text="__('Lessons')">
<span class="flex items-center">
<BookOpen class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
{{ course.lesson_count }}
</span>
</Tooltip>
</div>
<div v-if="course.enrollment_count">
<Tooltip :text="__('Enrolled Students')">
<span class="flex items-center">
<Users class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
{{ course.enrollment_count }}
</span>
</Tooltip>
</div>
<div v-if="course.avg_rating">
<Tooltip :text="__('Average Rating')">
<span class="flex items-center">
<Star class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
{{ course.avg_rating }}
</span>
</Tooltip>
</div>
<div v-if="course.status != 'Approved'">
<Badge
variant="solid"
:theme="course.status === 'Under Review' ? 'orange' : 'blue'"
size="sm"
>
{{ course.status }}
</Badge>
</div>
</div>
<div class="text-xl font-semibold leading-6">
{{ course.title }}
</div>
<div class="short-introduction">
{{ course.short_introduction }}
</div>
<div
v-if="user && course.membership"
class="w-full bg-gray-200 rounded-full h-1 mb-2"
>
<div
class="bg-gray-900 h-1 rounded-full"
:style="{ width: Math.ceil(course.membership.progress) + '%' }"
></div>
</div>
<div v-if="user && course.membership" class="text-sm mb-4">
{{ Math.ceil(course.membership.progress) }}% completed
</div>
<div class="flex items-center justify-between mt-auto">
<div class="flex avatar-group overlap">
<div
class="mr-1"
:class="{ 'avatar-group overlap': course.instructors.length > 1 }"
>
<UserAvatar
v-for="instructor in course.instructors"
:user="instructor"
/>
</div>
<span v-if="course.instructors.length == 1">
{{ course.instructors[0].full_name }}
</span>
<span v-if="course.instructors.length == 2">
{{ course.instructors[0].first_name }} and
{{ course.instructors[1].first_name }}
</span>
<span v-if="course.instructors.length > 2">
{{ course.instructors[0].first_name }} and
{{ course.instructors.length - 1 }} others
</span>
</div>
<div class="font-semibold">
{{ course.price }}
</div>
</div>
</div>
</div>
</template>
<script setup>
import { BookOpen, Users, Star } from 'lucide-vue-next'
import UserAvatar from '@/components/UserAvatar.vue'
import { sessionStore } from '@/stores/session'
import { Badge, Tooltip } from 'frappe-ui'
const { user } = sessionStore()
const props = defineProps({
course: {
type: Object,
default: null,
},
})
</script>
<style>
.course-image {
height: 168px;
width: 100%;
background-size: cover;
background-position: center;
background-repeat: no-repeat;
}
.course-card-pills {
background: #ffffff;
margin-left: 0;
margin-right: 0.5rem;
padding: 3.5px 8px;
font-size: 11px;
text-align: center;
letter-spacing: 0.011em;
text-transform: uppercase;
font-weight: 600;
width: fit-content;
}
.default-image {
display: flex;
flex-direction: column;
align-items: center;
background-color: theme('colors.orange.100');
color: theme('colors.orange.600');
}
.avatar-group {
display: inline-flex;
align-items: center;
}
.avatar-group .avatar {
transition: margin 0.1s ease-in-out;
}
.image-placeholder {
display: flex;
align-items: center;
flex: 1;
font-size: 5rem;
color: theme('colors.gray.700');
font-weight: 600;
}
.avatar-group.overlap .avatar + .avatar {
margin-left: calc(-8px);
}
.short-introduction {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
width: 100%;
overflow: hidden;
margin: 0.25rem 0 1.25rem;
line-height: 1.5;
}
</style>
@@ -0,0 +1,164 @@
<template>
<div class="shadow rounded-md min-w-80">
<iframe
v-if="course.data.video_link"
:src="video_link"
class="rounded-t-md min-h-56 w-full"
/>
<div class="p-5">
<div v-if="course.data.price" class="text-2xl font-semibold mb-3">
{{ course.data.price }}
</div>
<router-link
v-if="course.data.membership"
:to="{
name: 'Lesson',
params: {
courseName: course.name,
chapterNumber: course.data.current_lesson
? course.data.current_lesson.split('.')[0]
: 1,
lessonNumber: course.data.current_lesson
? course.data.current_lesson.split('.')[1]
: 1,
},
}"
>
<Button variant="solid" size="md" class="w-full">
<span>
{{ __('Continue Learning') }}
</span>
</Button>
</router-link>
<router-link
v-else-if="course.data.paid_course"
:to="{
name: 'Billing',
params: {
type: 'course',
name: course.data.name,
},
}"
>
<Button variant="solid" size="md" class="w-full">
<span>
{{ __('Buy this course') }}
</span>
</Button>
</router-link>
<Button
v-else
@click="enrollStudent()"
variant="solid"
class="w-full"
size="md"
>
<span>
{{ __('Start Learning') }}
</span>
</Button>
<router-link
v-if="user?.data?.is_moderator || is_instructor()"
:to="{
name: 'CreateCourse',
params: {
courseName: course.data.name,
},
}"
>
<Button variant="subtle" class="w-full mt-2" size="md">
<span>
{{ __('Edit') }}
</span>
</Button>
</router-link>
<div class="mt-8 mb-4 font-medium">
{{ __('This course has:') }}
</div>
<div class="flex items-center mb-3">
<BookOpen class="h-5 w-5 stroke-1.5 text-gray-600" />
<span class="ml-2">
{{ course.data.lesson_count }} {{ __('Lessons') }}
</span>
</div>
<div class="flex items-center mb-3">
<Users class="h-5 w-5 stroke-1.5 text-gray-600" />
<span class="ml-2">
{{ course.data.enrollment_count_formatted }}
{{ __('Enrolled Students') }}
</span>
</div>
<div class="flex items-center">
<Star class="h-5 w-5 stroke-1.5 fill-orange-500 text-gray-50" />
<span class="ml-2">
{{ course.data.avg_rating }} {{ __('Rating') }}
</span>
</div>
</div>
</div>
</template>
<script setup>
import { BookOpen, Users, Star } from 'lucide-vue-next'
import { computed, inject } from 'vue'
import { Button, createResource } from 'frappe-ui'
import { createToast } from '@/utils/'
import { useRouter } from 'vue-router'
const router = useRouter()
const user = inject('$user')
const props = defineProps({
course: {
type: Object,
default: null,
},
})
const video_link = computed(() => {
if (props.course.data.video_link) {
return 'https://www.youtube.com/embed/' + props.course.data.video_link
}
return null
})
function enrollStudent() {
if (!user.data) {
createToast({
title: 'Please Login',
icon: 'alert-circle',
iconClasses: 'text-yellow-600 bg-yellow-100',
})
setTimeout(() => {
window.location.href = `/login?redirect-to=${window.location.pathname}`
}, 3000)
} else {
const enrollStudentResource = createResource({
url: 'lms.lms.doctype.lms_enrollment.lms_enrollment.create_membership',
})
console.log(props.course)
enrollStudentResource
.submit({
course: props.course.data.name,
})
.then(() => {
createToast({
title: 'Enrolled Successfully',
icon: 'check',
iconClasses: 'text-green-600 bg-green-100',
})
setTimeout(() => {
router.push({
name: 'Lesson',
params: {
courseName: props.course.data.name,
chapterNumber: 1,
lessonNumber: 1,
},
})
}, 3000)
})
}
}
const is_instructor = () => {}
</script>
+170
View File
@@ -0,0 +1,170 @@
<template>
<div class="text-base">
<div
v-if="title && (outline.data?.length || allowEdit)"
class="flex items-center justify-between mb-4"
>
<div class="font-semibold" :class="allowEdit ? 'text-base' : 'text-lg'">
{{ __(title) }}
</div>
<Button size="sm" v-if="allowEdit" @click="openChapterModal()">
{{ __('Add Chapter') }}
</Button>
<!-- <span class="font-medium cursor-pointer" @click="expandAllChapters()">
{{ expandAll ? __("Collapse all chapters") : __("Expand all chapters") }}
</span> -->
</div>
<div
:class="{
'shadow rounded-md pt-2 px-2': showOutline && outline.data?.length,
}"
>
<Disclosure
v-slot="{ open }"
v-for="(chapter, index) in outline.data"
:key="chapter.name"
:defaultOpen="openChapterDetail(chapter.idx)"
>
<DisclosureButton ref="" class="flex w-full px-2 py-3">
<ChevronRight
:class="{
'rotate-90 transform duration-200': open,
'duration-200': !open,
open: index == 1,
}"
class="h-4 w-4 text-gray-900 stroke-1 mr-2"
/>
<div class="text-base text-left font-medium leading-5">
{{ chapter.title }}
</div>
</DisclosureButton>
<DisclosurePanel class="pb-2">
<div v-for="lesson in chapter.lessons" :key="lesson.name">
<div class="outline-lesson pl-8 py-2">
<router-link
:to="{
name: allowEdit ? 'CreateLesson' : 'Lesson',
params: {
courseName: courseName,
chapterNumber: lesson.number.split('.')[0],
lessonNumber: lesson.number.split('.')[1],
},
}"
>
<div class="flex items-center text-sm leading-5">
<MonitorPlay
v-if="lesson.icon === 'icon-youtube'"
class="h-4 w-4 text-gray-900 stroke-1 mr-2"
/>
<HelpCircle
v-else-if="lesson.icon === 'icon-quiz'"
class="h-4 w-4 text-gray-900 stroke-1 mr-2"
/>
<FileText
v-else-if="lesson.icon === 'icon-list'"
class="h-4 w-4 text-gray-900 stroke-1 mr-2"
/>
{{ lesson.title }}
<Check
v-if="lesson.is_complete"
class="h-4 w-4 text-green-500 stroke-1.5 ml-2"
/>
</div>
</router-link>
</div>
</div>
<div v-if="allowEdit" class="flex mt-2 pl-8">
<router-link
:to="{
name: 'CreateLesson',
params: {
courseName: courseName,
chapterNumber: chapter.idx,
lessonNumber: chapter.lessons.length + 1,
},
}"
>
<Button>
{{ __('Add Lesson') }}
</Button>
</router-link>
<Button class="ml-2" @click="openChapterModal(chapter)">
{{ __('Edit Chapter') }}
</Button>
</div>
</DisclosurePanel>
</Disclosure>
</div>
</div>
<ChapterModal
v-model="showChapterModal"
v-model:outline="outline"
:course="courseName"
:chapterDetail="getCurrentChapter()"
/>
</template>
<script setup>
import { Button, createResource } from 'frappe-ui'
import { ref } from 'vue'
import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
import {
ChevronRight,
MonitorPlay,
HelpCircle,
FileText,
Check,
} from 'lucide-vue-next'
import { useRoute } from 'vue-router'
import ChapterModal from '@/components/Modals/ChapterModal.vue'
const route = useRoute()
const expandAll = ref(true)
const showChapterModal = ref(false)
const currentChapter = ref(null)
const props = defineProps({
courseName: {
type: String,
required: true,
},
showOutline: {
type: Boolean,
default: false,
},
title: {
type: String,
default: '',
},
allowEdit: {
type: Boolean,
default: false,
},
})
const outline = createResource({
url: 'lms.lms.utils.get_course_outline',
cache: ['course_outline', props.courseName],
params: {
course: props.courseName,
},
auto: true,
})
const openChapterDetail = (index) => {
return index == route.params.chapterNumber || index == 1
}
const openChapterModal = (chapter = null) => {
currentChapter.value = chapter
showChapterModal.value = true
}
const getCurrentChapter = () => {
return currentChapter.value
}
</script>
<style>
.outline-lesson:has(.router-link-active) {
background-color: theme('colors.gray.100');
}
</style>
+103
View File
@@ -0,0 +1,103 @@
<template>
<div v-if="reviews.data" class="mt-20 mb-10">
<Button
v-if="membership && !hasReviewed.data"
@click="openReviewModal()"
class="float-right"
>
{{ __('Write a Review') }}
</Button>
<div class="flex items-center font-semibold text-2xl">
<Star class="h-6 w-6 stroke-1 text-gray-50 fill-orange-500 mr-1" />
{{ avg_rating }} {{ __('ratings and ') }} {{ reviews.data.length }}
{{ __('reviews') }}
</div>
<div class="grid gap-8 mt-10">
<div v-for="(review, index) in reviews.data">
<div class="flex items-center">
<UserAvatar :user="review.owner_details" :size="'2xl'" />
<div class="mx-4">
<span class="text-lg font-medium mr-4">
{{ review.owner_details.full_name }}
</span>
<span>
{{ review.creation }}
</span>
<div class="flex mt-2">
<Star
v-for="index in 5"
class="h-5 w-5 text-gray-100 bg-gray-200 rounded-sm mr-2"
:class="
index <= Math.ceil(review.rating)
? 'fill-orange-500'
: 'fill-gray-600'
"
/>
</div>
</div>
</div>
<div v-if="review.review" class="mt-4 leading-5">
{{ review.review }}
</div>
</div>
</div>
</div>
<ReviewModal
v-model="showReviewModal"
v-model:reloadReviews="reviews"
v-model:hasReviewed="hasReviewed"
:courseName="courseName"
/>
</template>
<script setup>
import { Star } from 'lucide-vue-next'
import { createResource, Button } from 'frappe-ui'
import { computed, ref, inject } from 'vue'
import UserAvatar from '@/components/UserAvatar.vue'
import ReviewModal from '@/components/Modals/ReviewModal.vue'
const user = inject('$user')
const props = defineProps({
courseName: {
type: String,
required: true,
},
avg_rating: {
type: Number,
required: true,
},
membership: {
type: Object,
required: false,
},
})
const hasReviewed = createResource({
url: 'frappe.client.get_count',
cache: ['eligible_to_review', props.courseName, props.membership?.member],
params: {
doctype: 'LMS Course Review',
filters: {
course: props.courseName,
owner: props.membership?.member,
},
},
auto: user.data?.name ? true : false,
})
const reviews = createResource({
url: 'lms.lms.utils.get_reviews',
cache: ['course_reviews', props.courseName],
params: {
course: props.courseName,
},
auto: true,
})
const showReviewModal = ref(false)
function openReviewModal() {
showReviewModal.value = true
}
</script>
+30
View File
@@ -0,0 +1,30 @@
<template>
<div v-if="course">
<div class="text-xl font-semibold">
{{ course.title }}
</div>
<div v-if="course.chapters.length">
{{ course.chapters }}
</div>
<div v-else class="border bg-white rounded-md p-5 text-center mt-4">
<div>
{{
__(
'There are no chapters in this course. Create and manage chapters from here.'
)
}}
</div>
<Button class="mt-4">
{{ __('Add Chapter') }}
</Button>
</div>
</div>
</template>
<script setup>
const props = defineProps({
course: {
type: Object,
default: {},
},
})
</script>
+20
View File
@@ -0,0 +1,20 @@
<template>
<div class="relative flex h-full flex-col">
<div class="h-full flex-1">
<div class="flex h-screen text-base">
<div
class="relative block min-h-0 flex-shrink-0 overflow-hidden hover:overflow-auto"
>
<slot name="sidebar" />
<AppSidebar />
</div>
<div class="w-full overflow-auto" id="scrollContainer">
<slot />
</div>
</div>
</div>
</div>
</template>
<script setup>
import AppSidebar from './AppSidebar.vue'
</script>
@@ -0,0 +1,231 @@
<template>
<div class="mt-6">
<div v-if="!singleThread" class="flex items-center mb-5">
<Button variant="outline" @click="showTopics = true">
<template #icon>
<ChevronLeft class="w-5 h-5 stroke-1.5 text-gray-700" />
</template>
</Button>
<span class="text-lg font-semibold ml-2">
{{ topic.title }}
</span>
</div>
<div v-for="(reply, index) in replies.data">
<div
class="py-3"
:class="{ 'border-b': index + 1 != replies.data.length }"
>
<div class="flex items-center justify-between mb-2">
<div class="flex items-center">
<UserAvatar :user="reply.user" class="mr-2" />
<span>
{{ reply.user.full_name }}
</span>
<span class="text-sm ml-2">
{{ timeAgo(reply.creation) }}
</span>
</div>
<Dropdown
v-if="user.data.name == reply.owner && !reply.editable"
:options="[
{
label: 'Edit',
onClick() {
reply.editable = true
},
},
{
label: 'Delete',
onClick() {
deleteReply(reply)
},
},
]"
>
<template v-slot="{ open }">
<MoreHorizontal class="w-4 h-4 stroke-1.5 cursor-pointer" />
</template>
</Dropdown>
<div v-if="reply.editable">
<Button variant="ghost" @click="postEdited(reply)">
{{ __('Post') }}
</Button>
<Button variant="ghost" @click="reply.editable = false">
{{ __('Discard') }}
</Button>
</div>
</div>
<TextEditor
:content="reply.reply"
@change="(val) => (reply.reply = val)"
:editable="reply.editable || false"
:fixedMenu="reply.editable || false"
:editorClass="
reply.editable
? 'ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none'
: 'prose-sm'
"
/>
</div>
</div>
<TextEditor
class="mt-5"
:content="newReply"
@change="(val) => (newReply = val)"
placeholder="Type your reply here..."
:fixedMenu="true"
editorClass="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none border border-gray-300 rounded-b-md min-h-[7rem] py-1 px-2"
/>
<div class="flex justify-between mt-2">
<span> </span>
<Button @click="postReply()">
<span>
{{ __('Post') }}
</span>
</Button>
</div>
</div>
</template>
<script setup>
import { createResource, TextEditor, Button, Dropdown } from 'frappe-ui'
import { timeAgo } from '../utils'
import UserAvatar from '@/components/UserAvatar.vue'
import { ChevronLeft, MoreHorizontal } from 'lucide-vue-next'
import { ref, inject, onMounted } from 'vue'
import { createToast } from '../utils'
const showTopics = defineModel('showTopics')
const newReply = ref('')
const socket = inject('$socket')
const user = inject('$user')
const props = defineProps({
topic: {
type: Object,
required: true,
},
singleThread: {
type: Boolean,
default: false,
},
})
onMounted(() => {
socket.on('publish_message', (data) => {
replies.reload()
})
socket.on('update_message', (data) => {
replies.reload()
})
socket.on('delete_message', (data) => {
replies.reload()
})
})
const replies = createResource({
url: 'lms.lms.utils.get_discussion_replies',
cache: ['replies', props.topic],
makeParams(values) {
return {
topic: props.topic.name,
}
},
auto: true,
})
const newReplyResource = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'Discussion Reply',
reply: newReply.value,
topic: props.topic.name,
},
}
},
})
const postReply = () => {
newReplyResource.submit(
{},
{
validate() {
if (!newReply.value) {
return 'Reply cannot be empty'
}
},
onSuccess() {
newReply.value = ''
replies.reload()
},
onError(err) {
createToast({
title: 'Error',
text: err.messages?.[0] || err,
icon: 'x',
iconClasses: 'bg-red-600 text-white rounded-md p-px',
position: 'top-center',
timeout: 10,
})
},
}
)
}
const editReplyResource = createResource({
url: 'frappe.client.set_value',
makeParams(values) {
return {
doctype: 'Discussion Reply',
name: values.name,
fieldname: 'reply',
value: values.reply,
}
},
})
const postEdited = (reply) => {
editReplyResource.submit(
{
name: reply.name,
reply: reply.reply,
},
{
validate() {
if (!reply.reply) {
return 'Reply cannot be empty'
}
},
onSuccess() {
reply.editable = false
replies.reload()
},
}
)
}
const deleteReplyResource = createResource({
url: 'frappe.client.delete',
makeParams(values) {
return {
doctype: 'Discussion Reply',
name: values.name,
}
},
})
const deleteReply = (reply) => {
deleteReplyResource.submit(
{
name: reply.name,
},
{
onSuccess() {
replies.reload()
},
}
)
}
</script>
+132
View File
@@ -0,0 +1,132 @@
<template>
<div>
<Button v-if="!singleThread" class="float-right" @click="openTopicModal()">
{{ __('New {0}').format(title) }}
</Button>
<div class="text-xl font-semibold">
{{ __(title) }}
</div>
</div>
<div v-if="topics.data?.length && !singleThread">
<div v-if="showTopics" v-for="(topic, index) in topics.data">
<div
@click="showReplies(topic)"
class="flex items-center cursor-pointer py-5 w-full"
:class="{ 'border-b': index + 1 != topics.data.length }"
>
<UserAvatar :user="topic.user" size="2xl" class="mr-4" />
<div>
<div class="text-lg font-semibold mb-1">
{{ topic.title }}
</div>
<div class="flex items-center">
<span>
{{ topic.user.full_name }}
</span>
<span class="text-sm ml-3">
{{ timeAgo(topic.creation) }}
</span>
</div>
</div>
</div>
</div>
<div v-else>
<DiscussionReplies
:topic="currentTopic"
v-model:showTopics="showTopics"
/>
</div>
</div>
<div v-else-if="singleThread && topics.data">
<DiscussionReplies :topic="topics.data" :singleThread="singleThread" />
</div>
<div v-else class="flex justify-center border mt-5 p-5 rounded-md">
<MessageSquareIcon class="w-10 h-10 stroke-1.5 text-gray-800 mr-2" />
<div>
<div class="text-xl font-semibold mb-2">
{{ __(emptyStateTitle) }}
</div>
<div>
{{ __(emptyStateText) }}
</div>
</div>
</div>
<DiscussionModal
v-model="showTopicModal"
:title="__('New {0}').format(title)"
:doctype="props.doctype"
:docname="props.docname"
v-model:reloadTopics="topics"
/>
</template>
<script setup>
import { createResource, Button, TextEditor } from 'frappe-ui'
import UserAvatar from '@/components/UserAvatar.vue'
import { timeAgo } from '../utils'
import { ref, onMounted, inject } from 'vue'
import DiscussionReplies from '@/components/DiscussionReplies.vue'
import DiscussionModal from '@/components/Modals/DiscussionModal.vue'
import { MessageSquareIcon } from 'lucide-vue-next'
const showTopics = ref(true)
const currentTopic = ref(null)
const socket = inject('$socket')
const user = inject('$user')
const showTopicModal = ref(false)
const props = defineProps({
title: {
type: String,
required: true,
},
doctype: {
type: String,
required: true,
},
docname: {
type: String,
required: true,
},
emptyStateTitle: {
type: String,
default: 'No topics yet',
},
emptyStateText: {
type: String,
default: 'Be the first to start a discussion',
},
singleThread: {
type: Boolean,
default: false,
},
})
onMounted(() => {
if (user.data) topics.reload()
socket.on('new_discussion_topic', (data) => {
topics.refresh()
})
})
const topics = createResource({
url: 'lms.lms.utils.get_discussion_topics',
cache: ['topics', props.doctype, props.docname],
makeParams() {
return {
doctype: props.doctype,
docname: props.docname,
single_thread: props.singleThread,
}
},
})
const showReplies = (topic) => {
showTopics.value = false
currentTopic.value = topic
}
const openTopicModal = () => {
showTopicModal.value = true
}
</script>
@@ -0,0 +1,23 @@
<template>
<svg
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<g clip-path="url(#clip0_1584_1676)">
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M3.17474 0.625C2.34632 0.625 1.67474 1.29657 1.67474 2.125V7.475C1.67474 8.30343 2.34632 8.975 3.17474 8.975H14.8247C15.6532 8.975 16.3247 8.30343 16.3247 7.475V2.125C16.3247 1.29657 15.6532 0.625 14.8247 0.625H3.17474ZM2.67474 2.125C2.67474 1.84886 2.8986 1.625 3.17474 1.625H14.8247C15.1009 1.625 15.3247 1.84886 15.3247 2.125V7.475C15.3247 7.75114 15.1009 7.975 14.8247 7.975H3.17474C2.8986 7.975 2.67474 7.75114 2.67474 7.475V2.125ZM4.27478 10.0749C3.99864 10.0749 3.77478 10.2987 3.77478 10.5749V12.6749C3.77478 12.951 3.99864 13.1749 4.27478 13.1749C4.55092 13.1749 4.77478 12.951 4.77478 12.6749V11.0749H6.92478V12.6749C6.92478 12.951 7.14864 13.1749 7.42478 13.1749C7.70092 13.1749 7.92478 12.951 7.92478 12.6749V10.5749C7.92478 10.2987 7.70092 10.0749 7.42478 10.0749H4.27478ZM10.0749 10.5749C10.0749 10.2987 10.2987 10.0749 10.5749 10.0749H13.7249C14.001 10.0749 14.2249 10.2987 14.2249 10.5749V12.6749C14.2249 12.951 14.001 13.1749 13.7249 13.1749C13.4487 13.1749 13.2249 12.951 13.2249 12.6749V11.0749H11.0749V12.6749C11.0749 12.951 10.851 13.1749 10.5749 13.1749C10.2987 13.1749 10.0749 12.951 10.0749 12.6749V10.5749ZM1.125 14.275C0.848858 14.275 0.625 14.4988 0.625 14.775V16.875C0.625 17.1511 0.848858 17.375 1.125 17.375C1.40114 17.375 1.625 17.1511 1.625 16.875V15.275H3.775V16.875C3.775 17.1511 3.99886 17.375 4.275 17.375C4.55114 17.375 4.775 17.1511 4.775 16.875V14.775C4.775 14.4988 4.55114 14.275 4.275 14.275H1.125ZM13.2252 14.775C13.2252 14.4988 13.4491 14.275 13.7252 14.275H16.8752C17.1514 14.275 17.3752 14.4988 17.3752 14.775V16.875C17.3752 17.1511 17.1514 17.375 16.8752 17.375C16.5991 17.375 16.3752 17.1511 16.3752 16.875V15.275H14.2252V16.875C14.2252 17.1511 14.0014 17.375 13.7252 17.375C13.4491 17.375 13.2252 17.1511 13.2252 16.875V14.775ZM7.42511 14.275C7.14897 14.275 6.92511 14.4988 6.92511 14.775V16.875C6.92511 17.1511 7.14897 17.375 7.42511 17.375C7.70125 17.375 7.92511 17.1511 7.92511 16.875V15.275H10.0751V16.875C10.0751 17.1511 10.299 17.375 10.5751 17.375C10.8513 17.375 11.0751 17.1511 11.0751 16.875V14.775C11.0751 14.4988 10.8513 14.275 10.5751 14.275H7.42511Z"
fill="#525252"
/>
</g>
<defs>
<clipPath id="clip0_1584_1676">
<rect width="18" height="18" fill="white" />
</clipPath>
</defs>
</svg>
</template>
@@ -0,0 +1,27 @@
<template>
<svg
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M10.875 9.06223L3 9.06232"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
d="M6.74537 5.31699L3 9.06236L6.74527 12.8076"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
d="M14.1423 4L14.1423 14.125"
stroke="currentColor"
stroke-linecap="round"
/>
</svg>
</template>
@@ -0,0 +1,18 @@
<template>
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="8"
cy="8"
r="4.5"
fill="transparent"
stroke="currentColor"
stroke-width="3"
/>
</svg>
</template>
+36
View File
@@ -0,0 +1,36 @@
<template>
<svg
width="118"
height="118"
viewBox="0 0 118 118"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M93.9278 0H23.1013C10.3428 0 0 10.3428 0 23.1013V93.9278C0 106.686 10.3428 117.029 23.1013 117.029H93.9278C106.686 117.029 117.029 106.686 117.029 93.9278V23.1013C117.029 10.3428 106.686 0 93.9278 0Z"
fill="url(#paint0_radial_174_336)"
/>
<path
d="M93.9278 0H23.1013C10.3428 0 0 10.3428 0 23.1013V93.9278C0 106.686 10.3428 117.029 23.1013 117.029H93.9278C106.686 117.029 117.029 106.686 117.029 93.9278V23.1013C117.029 10.3428 106.686 0 93.9278 0Z"
fill="#0B3D3D"
fill-opacity="0.8"
/>
<path
d="M95.1879 33.1294L91.4077 32.0268C80.1721 28.7716 67.9389 30.9242 58.5409 37.7496C52.083 33.0769 43.9975 30.5042 36.1746 30.5042H21.8938V41.0048H36.2796C42.2649 41.0048 48.1978 42.9999 52.923 46.6226L58.5934 50.9279L64.2637 46.6226C70.144 42.1599 77.5469 40.2698 84.7923 41.2673V76.1818C75.5518 75.2367 66.2063 77.7044 58.6459 83.2172C51.0854 77.7044 41.6349 75.2367 32.4994 76.1818V52.8705H21.9988V86.4724H95.3454V33.1294H95.1879Z"
fill="#58FF9B"
/>
<defs>
<radialGradient
id="paint0_radial_174_336"
cx="0"
cy="0"
r="1"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(117.24 -101.5) rotate(105.042) scale(226.282)"
>
<stop offset="0.445162" stop-color="#1F7676" />
<stop offset="1" stop-color="#0A4B4B" />
</radialGradient>
</defs>
</svg>
</template>
+81
View File
@@ -0,0 +1,81 @@
<template>
<div class="flex shadow rounded-md p-4 h-full">
<img
:src="job.company_logo"
class="w-12 h-12 rounded-lg object-contain mr-4"
:alt="job.company_name"
/>
<div>
<div class="text-xl font-semibold mb-2">
{{ job.job_title }}
</div>
<div>
{{ __('posted by') }}
<span class="font-medium">
{{ job.company_name }}
</span>
</div>
<div class="flex items-center my-4">
<Badge :label="job.type" theme="green" size="lg" class="mr-4" />
<Badge :label="job.location.split(' ')[0]" theme="gray" size="lg">
<template #prefix>
<MapPin class="h-4 w-4 stroke-1.5" />
</template>
</Badge>
</div>
<div>
{{ __('posted on') }}
<span class="font-medium">
{{ dayjs(job.creation).format('DD MMM YYYY') }}
</span>
</div>
</div>
</div>
<!-- <div class="flex flex-col shadow rounded-md p-4 h-full">
<div class="flex justify-between">
<div>
<div class="text-xl font-semibold mb-2">
{{ job.job_title }}
</div>
<div>
{{ __("posted by") }}
<span class="font-medium">
{{ job.company_name }}
</span>
</div>
</div>
<img
:src="job.company_logo"
class="w-12 h-12 rounded-lg object-contain"
/>
</div>
<div class="flex justify-between mt-8">
<div class="flex items-center">
<Badge :label="job.type" theme="green" size="lg" class="mr-4"/>
<Badge :label="job.location" theme="gray" size="lg">
<template #prefix>
<MapPin class="h-4 w-4 stroke-1.5" />
</template>
</Badge>
</div>
<div>
<span class="font-medium">
{{ dayjs(job.creation).format('DD MMM YYYY') }}
</span>
</div>
</div>
</div> -->
</template>
<script setup>
import { MapPin } from 'lucide-vue-next'
import { Badge } from 'frappe-ui'
import { inject } from 'vue'
const dayjs = inject('$dayjs')
const props = defineProps({
job: {
type: Object,
default: null,
},
})
</script>
+99
View File
@@ -0,0 +1,99 @@
<template>
<div v-if="youtube">
<iframe
class="youtube-video"
:src="getYouTubeVideoSource(youtube.split('/').pop())"
width="100%"
height="400"
frameborder="0"
allowfullscreen
></iframe>
</div>
<div v-for="block in content.split('\n\n')">
<div v-if="block.includes('{{ YouTubeVideo')">
<iframe
class="youtube-video"
:src="getYouTubeVideoSource(block)"
width="100%"
height="400"
frameborder="0"
allowfullscreen
></iframe>
</div>
<div v-else-if="block.includes('{{ Quiz')">
<Quiz :quiz="getId(block)" />
</div>
<div v-else-if="block.includes('{{ Video')">
<video controls width="100%" controlsList="nodownload">
<source :src="getId(block)" type="video/mp4" />
</video>
</div>
<div v-else-if="block.includes('{{ PDF')">
<iframe
:src="getPDFSource(block)"
width="100%"
height="400"
frameborder="0"
allowfullscreen
></iframe>
</div>
<div v-else-if="block.includes('{{ Audio')">
<audio width="100%" controls controlsList="nodownload">
<source :src="getId(block)" type="audio/mp3" />
</audio>
</div>
<div v-else-if="block.includes('{{ Embed')">
<iframe
width="100%"
height="400"
:src="getId(block)"
frameborder="0"
allowfullscreen
>
</iframe>
</div>
<div v-else v-html="markdown.render(block)"></div>
</div>
<div v-if="quizId">
<Quiz :quiz="quizId" />
</div>
</template>
<script setup>
import Quiz from '@/components/QuizBlock.vue'
import MarkdownIt from 'markdown-it'
const markdown = new MarkdownIt({
html: true,
linkify: true,
})
const props = defineProps({
content: {
type: String,
required: true,
},
youtube: {
type: String,
required: false,
},
quizId: {
type: String,
required: false,
},
})
const getYouTubeVideoSource = (block) => {
if (block.includes('{{')) {
block = getId(block)
}
return `https://www.youtube.com/embed/${block}`
}
const getPDFSource = (block) => {
return `${getId(block)}#toolbar=0`
}
const getId = (block) => {
return block.match(/\(["']([^"']+?)["']\)/)[1]
}
</script>
+142
View File
@@ -0,0 +1,142 @@
<template>
<div class="text-lg font-semibold">
{{ __('Components') }}
</div>
<div class="mt-5">
<Tooltip
:text="
__(
'Content such as quiz, video and image will be added in the editor you select.'
)
"
placement="bottom"
>
<div class="">
<div class="text-xs text-gray-600 mb-1">
{{ __('Select an Editor') }}
</div>
<Select v-model="currentEditor" :options="getEditorOptions()" />
</div>
</Tooltip>
<div class="flex mt-4">
<Link
v-model="quiz"
class="flex-1"
doctype="LMS Quiz"
:label="__('Select a Quiz')"
/>
<Button @click="addQuiz()" class="self-end ml-2">
<template #icon>
<Plus class="h-4 w-4 stroke-1.5" />
</template>
</Button>
</div>
<div class="mt-4">
<div class="text-xs text-gray-600 mb-1">
{{ __('Add an image, video, pdf or audio.') }}
</div>
<div class="flex">
<FileUploader
v-if="!file"
:fileTypes="['image/*', 'video/*', 'audio/*', '.pdf']"
:validateFile="validateFile"
@success="(data) => addFile(data)"
>
<template v-slot="{ file, progress, uploading, openFileSelector }">
<div class="">
<Button @click="openFileSelector" :loading="uploading">
{{
uploading
? __('Uploading {0}%').format(progress)
: __('Upload an File')
}}
</Button>
</div>
</template>
</FileUploader>
<div v-else class="">
<div class="flex items-center">
<div class="border rounded-md p-2 mr-2">
<FileText class="h-4 w-4 stroke-1.5 text-gray-700" />
</div>
<div class="flex flex-col">
<span class="text-xs">
{{ file.file_name }}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup>
import Link from '@/components/Controls/Link.vue'
import { FileUploader, Button, Select, Tooltip } from 'frappe-ui'
import { Plus, FileText } from 'lucide-vue-next'
import { ref, watch } from 'vue'
const quiz = ref(null)
const file = ref(null)
const lessonEditor = ref(null)
const instructorEditor = ref(null)
const currentEditor = ref('Lesson Content')
const props = defineProps({
editor: {
required: true,
},
notesEditor: {
required: true,
},
})
const addQuiz = () => {
getCurrentEditor().caret.setToLastBlock('end', 0)
if (quiz.value) {
getCurrentEditor().blocks.insert('quiz', {
quiz: quiz.value,
})
quiz.value = null
}
}
const addFile = (data) => {
getCurrentEditor().caret.setToLastBlock('end', 0)
getCurrentEditor().blocks.insert('upload', data)
}
const validateFile = (file) => {
let extension = file.name.split('.').pop().toLowerCase()
if (!['jpg', 'jpeg', 'png', 'mp4', 'mov', 'mp3'].includes(extension)) {
return 'Only image and video files are allowed.'
}
}
const getEditorOptions = () => {
return [
{
label: 'Lesson Content',
value: 'Lesson Content',
},
{
label: 'Instructor Content',
value: 'Instructor Content',
},
]
}
const getCurrentEditor = () => {
return currentEditor.value == 'Lesson Content'
? lessonEditor.value
: instructorEditor.value
}
watch(
() => [props.editor, props.notesEditor],
([newEditor, newNotesEditor], [oldEditor, oldNotesEditor]) => {
lessonEditor.value = newEditor
instructorEditor.value = newNotesEditor
}
)
</script>
+110
View File
@@ -0,0 +1,110 @@
<template>
<Button
v-if="user.data.is_moderator"
variant="solid"
class="float-right mb-3"
@click="openLiveClassModal"
>
<template #prefix>
<Plus class="h-4 w-4" />
</template>
<span>
{{ __('Add Live Class') }}
</span>
</Button>
<div class="text-lg font-semibold mb-4">
{{ __('Live Class') }}
</div>
<div v-if="liveClasses.data?.length" class="grid grid-cols-2 gap-5">
<div v-for="cls in liveClasses.data">
<div class="border rounded-md p-3">
<div class="font-semibold text-lg mb-4">
{{ cls.title }}
</div>
<div class="flex items-center mb-2">
<Calendar class="w-4 h-4 stroke-1.5" />
<span class="ml-2">
{{ dayjs(cls.date).format('DD MMMM YYYY') }}
</span>
</div>
<div class="flex items-center mb-5">
<Clock class="w-4 h-4 stroke-1.5" />
<span class="ml-2">
{{ formatTime(cls.time) }}
</span>
</div>
<div class="mb-5">
{{ cls.description }}
</div>
<div class="flex items-center gap-2">
<a
:href="cls.start_url"
target="_blank"
class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
>
<Monitor class="h-4 w-4 stroke-1.5" />
{{ __('Start') }}
</a>
<a
:href="cls.join_url"
target="_blank"
class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
>
<Video class="h-4 w-4 stroke-1.5" />
{{ __('Join') }}
</a>
</div>
</div>
</div>
</div>
<div v-else class="text-sm italic text-gray-600">
{{ __('No live classes scheduled') }}
</div>
<LiveClassModal
:batch="props.batch"
v-model="showLiveClassModal"
v-model:reloadLiveClasses="liveClasses"
/>
</template>
<script setup>
import { createListResource, Button } from 'frappe-ui'
import { Plus, Clock, Calendar, Video, Monitor } from 'lucide-vue-next'
import { inject } from 'vue'
import LiveClassModal from '@/components/Modals/LiveClassModal.vue'
import { ref } from 'vue'
import { formatTime } from '@/utils/'
const user = inject('$user')
const showLiveClassModal = ref(false)
const dayjs = inject('$dayjs')
const props = defineProps({
batch: {
type: String,
required: true,
},
})
const liveClasses = createListResource({
doctype: 'LMS Live Class',
filters: {
batch_name: props.batch,
date: ['>=', new Date()],
},
fields: [
'title',
'description',
'time',
'date',
'start_url',
'join_url',
'owner',
],
orderBy: 'date',
auto: true,
})
const openLiveClassModal = () => {
showLiveClassModal.value = true
}
</script>
+61
View File
@@ -0,0 +1,61 @@
<template>
<div class="flex h-full flex-col">
<div class="h-full pb-10" id="scrollContainer">
<slot />
</div>
<div
v-if="tabs"
class="fixed flex justify-around border-t border-gray-300 bottom-0 z-10 w-full bg-white standalone:pb-4"
:style="{
gridTemplateColumns: `repeat(${tabs.length}, minmax(0, 1fr))`,
}"
>
<button
v-for="tab in tabs"
:key="tab.label"
:class="isVisible(tab) ? 'block' : 'hidden'"
class="flex flex-col items-center justify-center py-3 transition active:scale-95"
@click="handleClick(tab)"
>
<component
:is="tab.icon"
class="h-6 w-6 stroke-1.5"
:class="[isActive(tab) ? 'text-gray-900' : 'text-gray-600']"
/>
</button>
</div>
</div>
</template>
<script setup>
import { getSidebarLinks } from '../utils'
import { useRouter } from 'vue-router'
import { computed, inject } from 'vue'
import { sessionStore } from '@/stores/session'
const { logout, user } = sessionStore()
let { isLoggedIn } = sessionStore()
const router = useRouter()
const tabs = computed(() => {
return getSidebarLinks()
})
let isActive = (tab) => {
return tab.activeFor?.includes(router.currentRoute.value.name)
}
const handleClick = (tab) => {
if (tab.label == 'Log in') window.location.href = '/login'
else if (tab.label == 'Log out')
logout.submit().then(() => {
isLoggedIn = false
})
else router.push({ name: tab.to })
}
const isVisible = (tab) => {
if (tab.label == 'Log in') return !isLoggedIn
else if (tab.label == 'Log out') return isLoggedIn
else return true
}
</script>
@@ -0,0 +1,117 @@
<template>
<Dialog
v-model="show"
:options="{
title: __('Make an Announcement'),
size: 'xl',
actions: [
{
label: 'Submit',
variant: 'solid',
onClick: (close) => makeAnnouncement(close),
},
],
}"
>
<template #body-content>
<div class="flex flex-col gap-4">
<div class="">
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Subject') }}
</div>
<Input type="text" v-model="announcement.subject" />
</div>
<div class="">
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Reply To') }}
</div>
<Input type="text" v-model="announcement.replyTo" />
</div>
<div class="mb-4">
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Announcement') }}
</div>
<TextEditor
:bubbleMenu="true"
@change="(val) => (announcement.announcement = val)"
editorClass="prose-sm py-2 px-2 min-h-[200px] border-gray-300 hover:border-gray-400 rounded-md bg-gray-200"
/>
</div>
</div>
</template>
</Dialog>
</template>
<script setup>
import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
import { reactive } from 'vue'
import { createToast } from '@/utils/'
const show = defineModel()
const props = defineProps({
batch: {
type: String,
required: true,
},
students: {
type: Array,
required: true,
},
})
const announcement = reactive({
subject: '',
replyTo: '',
announcement: '',
})
const announcementResource = createResource({
url: 'frappe.core.doctype.communication.email.make',
makeParams(values) {
return {
recipients: props.students.join(', '),
cc: announcement.replyTo,
subject: announcement.subject,
content: announcement.announcement,
doctype: 'LMS Batch',
name: props.batch,
send_email: 1,
}
},
})
const makeAnnouncement = (close) => {
announcementResource.submit(
{},
{
validate() {
if (!props.students.length) {
return 'No students in this batch'
}
if (!announcement.subject) {
return 'Subject is required'
}
},
onSuccess() {
close()
createToast({
title: 'Success',
text: 'Announcement has been sent successfully',
icon: 'Check',
iconClasses: 'bg-green-600 text-white rounded-md p-px',
})
},
onError(err) {
createToast({
title: 'Error',
text: err.messages?.[0] || err,
icon: 'x',
iconClasses: 'bg-red-600 text-white rounded-md p-px',
position: 'top-center',
timeout: 10,
})
},
}
)
}
</script>
@@ -0,0 +1,68 @@
<template>
<Dialog
v-model="show"
:options="{
title: __('Add a course'),
size: 'sm',
actions: [
{
label: __('Submit'),
variant: 'solid',
onClick: (close) => addCourse(close),
},
],
}"
>
<template #body-content>
<Link doctype="LMS Course" v-model="course" />
</template>
</Dialog>
</template>
<script setup>
import { Dialog, createResource } from 'frappe-ui'
import { ref, defineModel } from 'vue'
import Link from '@/components/Controls/Link.vue'
import { showToast } from '@/utils'
const show = defineModel()
const course = ref(null)
const courses = defineModel('courses')
const props = defineProps({
batch: {
type: String,
default: null,
},
})
const createBatchCourse = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'Batch Course',
parent: props.batch,
parenttype: 'LMS Batch',
parentfield: 'courses',
course: course.value,
},
}
},
})
const addCourse = (close) => {
createBatchCourse.submit(
{},
{
onSuccess() {
courses.value.reload()
close()
course.value = null
},
onError(err) {
showToast('Error', err.message[0] || err, 'x')
},
}
)
}
</script>
@@ -0,0 +1,161 @@
<template>
<Dialog
v-model="show"
:options="{
title: __('Add Chapter'),
size: 'lg',
actions: [
{
label: chapterDetail ? __('Edit Chapter') : __('Add Chapter'),
variant: 'solid',
onClick: (close) =>
chapterDetail ? editChapter(close) : addChapter(close),
},
],
}"
>
<template #body-content>
<FormControl label="Title" v-model="chapter.title" class="mb-4" />
</template>
</Dialog>
</template>
<script setup>
import { Dialog, FormControl, createResource } from 'frappe-ui'
import { defineModel, reactive, watch, inject } from 'vue'
import { createToast, formatTime } from '@/utils/'
const show = defineModel()
const outline = defineModel('outline')
const props = defineProps({
course: {
type: String,
required: true,
},
chapterDetail: {
type: Object,
},
})
const chapter = reactive({
title: '',
})
const chapterResource = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'Course Chapter',
title: chapter.title,
description: chapter.description,
course: props.course,
},
}
},
})
const chapterEditResource = createResource({
url: 'frappe.client.set_value',
makeParams(values) {
return {
doctype: 'Course Chapter',
name: props.chapterDetail?.name,
fieldname: 'title',
value: chapter.title,
}
},
})
const chapterReference = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'Chapter Reference',
chapter: values.name,
parent: props.course,
parenttype: 'LMS Course',
parentfield: 'chapters',
},
}
},
})
const addChapter = (close) => {
chapterResource.submit(
{},
{
validate() {
if (!chapter.title) {
return 'Title is required'
}
},
onSuccess: (data) => {
chapterReference.submit(
{ name: data.name },
{
onSuccess(data) {
outline.value.reload()
createToast({
text: 'Chapter added successfully',
icon: 'check',
iconClasses: 'bg-green-600 text-white rounded-md p-px',
})
},
onError(err) {
showError(err)
},
}
)
close()
},
onError(err) {
showError(err)
},
}
)
}
const editChapter = (close) => {
chapterEditResource.submit(
{},
{
validate() {
if (!chapter.title) {
return 'Title is required'
}
},
onSuccess() {
outline.value.reload()
createToast({
text: 'Chapter updated successfully',
icon: 'check',
iconClasses: 'bg-green-600 text-white rounded-md p-px',
})
close()
},
onError(err) {
showError(err)
},
}
)
}
const showError = (err) => {
createToast({
title: 'Error',
text: err.messages?.[0] || err,
icon: 'x',
iconClasses: 'bg-red-600 text-white rounded-md p-px',
position: 'top-center',
timeout: 10,
})
}
watch(
() => props.chapterDetail,
(newChapter) => {
chapter.title = newChapter?.title
}
)
</script>
@@ -0,0 +1,114 @@
<template>
<Dialog
:options="{
title: props.title,
size: '2xl',
actions: [
{
label: 'Submit',
variant: 'solid',
onClick: (close) => submitTopic(close),
},
],
}"
>
<template #body-content>
<div class="flex flex-col gap-4">
<div>
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Title') }}
</div>
<Input type="text" v-model="topic.title" />
</div>
<div>
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Details') }}
</div>
<TextEditor
:content="topic.reply"
@change="(val) => (topic.reply = val)"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
/>
</div>
</div>
</template>
</Dialog>
</template>
<script setup>
import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
import { reactive, defineModel } from 'vue'
const topics = defineModel('reloadTopics')
const props = defineProps({
title: {
type: String,
required: true,
},
doctype: {
type: String,
required: true,
},
docname: {
type: String,
required: true,
},
})
const topic = reactive({
title: '',
reply: '',
})
const topicResource = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'Discussion Topic',
reference_doctype: props.doctype,
reference_docname: props.docname,
title: topic.title,
},
}
},
})
const replyResource = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'Discussion Reply',
topic: values.topic,
reply: topic.reply,
},
}
},
})
const submitTopic = (close) => {
topicResource.submit(
{},
{
onSuccess(data) {
replyResource.submit(
{
topic: data.name,
},
{
onSuccess() {
topic.title = ''
topic.reply = ''
topics.value.reload()
close()
},
}
)
},
}
)
}
</script>
@@ -0,0 +1,188 @@
<template>
<Dialog
v-model="show"
:options="{
title: __('Schedule Evaluation'),
size: 'xl',
actions: [
{
label: __('Submit'),
variant: 'solid',
onClick: (close) => submitEvaluation(close),
},
],
}"
>
<template #body-content>
<div class="flex flex-col gap-4">
<div>
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Course') }}
</div>
<Select v-model="evaluation.course" :options="getCourses()" />
</div>
<div>
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Date') }}
</div>
<DatePicker v-model="evaluation.date" />
</div>
<div v-if="slots.data?.length">
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Select a slot') }}
</div>
<div class="grid grid-cols-2 gap-2">
<div v-for="slot in slots.data">
<div
class="text-base text-center border rounded-md bg-gray-200 p-2 cursor-pointer"
@click="saveSlot(slot)"
:class="{
'border-gray-900': evaluation.start_time == slot.start_time,
}"
>
{{ formatTime(slot.start_time) }} -
{{ formatTime(slot.end_time) }}
</div>
</div>
</div>
</div>
<div v-else class="text-sm italic text-red-600">
{{ __('No slots available for this date.') }}
</div>
</div>
</template>
</Dialog>
</template>
<script setup>
import { Dialog, createResource, Select, DatePicker } from 'frappe-ui'
import { defineModel, reactive, watch, inject } from 'vue'
import { createToast, formatTime } from '@/utils/'
const user = inject('$user')
const dayjs = inject('$dayjs')
const show = defineModel()
const evaluations = defineModel('reloadEvals')
const props = defineProps({
courses: {
type: Array,
default: [],
},
batch: {
type: String,
default: null,
},
endDate: {
type: String,
default: null,
},
})
let evaluation = reactive({
course: '',
date: '',
start_time: '',
end_time: '',
day: '',
batch: props.batch,
member: user.data.name,
})
const createEvaluation = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'LMS Certificate Request',
batch_name: values.batch,
...values,
},
}
},
})
function submitEvaluation(close) {
createEvaluation.submit(evaluation, {
validate() {
if (!evaluation.course) {
return 'Please select a course.'
}
if (!evaluation.date) {
return 'Please select a date.'
}
if (!evaluation.start_time) {
return 'Please select a slot.'
}
if (dayjs(evaluation.date).isSameOrBefore(dayjs(), 'day')) {
return 'Please select a future date.'
}
if (dayjs(evaluation.date).isAfter(dayjs(props.endDate), 'day')) {
return `Please select a date before the end date ${dayjs(
props.endDate
).format('DD MMMM YYYY')}.`
}
},
onSuccess() {
evaluations.value.reload()
close()
},
onError(err) {
createToast({
title: 'Error',
text: err.messages?.[0] || err,
icon: 'x',
iconClasses: 'bg-red-600 text-white rounded-md p-px',
position: 'top-center',
timeout: 10,
})
},
})
}
const getCourses = () => {
let courses = []
for (const course of props.courses) {
courses.push({
label: course.title,
value: course.course,
})
}
return courses
}
const slots = createResource({
url: 'lms.lms.doctype.course_evaluator.course_evaluator.get_schedule',
makeParams(values) {
return {
course: values.course,
date: values.date,
batch: props.batch,
}
},
})
watch(
() => evaluation.date,
(date) => {
evaluation.start_time = ''
if (date) {
slots.submit(evaluation)
}
}
)
watch(
() => evaluation.course,
(course) => {
evaluation.date = ''
evaluation.start_time = ''
slots.reset()
}
)
const saveSlot = (slot) => {
evaluation.start_time = slot.start_time
evaluation.end_time = slot.end_time
evaluation.day = slot.day
}
</script>
@@ -0,0 +1,137 @@
<template>
<Dialog
v-model="show"
class="text-base"
:options="{
title: __('Apply for this job'),
size: 'lg',
actions: [
{
label: 'Submit',
variant: 'solid',
onClick: (close) => {
submitResume(close)
},
},
],
}"
>
<template #body-content>
<div class="flex flex-col gap-4">
<p>
{{
__(
'Submit your resume to proceed with your application for this position. Upon submission, it will be shared with the job poster.'
)
}}
</p>
<div v-if="!resume">
<FileUploader
:fileTypes="['.pdf']"
:validateFile="validateFile"
@success="
(file) => {
resume = file
}
"
>
<template v-slot="{ file, progress, uploading, openFileSelector }">
<div class="">
<Button @click="openFileSelector" :loading="uploading">
{{
uploading ? `Uploading ${progress}%` : 'Upload your resume'
}}
</Button>
</div>
</template>
</FileUploader>
</div>
<div v-else class="flex items-center">
<div class="border rounded-md p-2 mr-2">
<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
</div>
<div class="flex flex-col">
<span>
{{ resume.file_name }}
</span>
<span class="text-sm text-gray-500 mt-1">
{{ getFileSize(resume.file_size) }}
</span>
</div>
</div>
</div>
</template>
</Dialog>
</template>
<script setup>
import { Dialog, FileUploader, Button, createResource } from 'frappe-ui'
import { FileText } from 'lucide-vue-next'
import { ref, inject, defineModel } from 'vue'
import { createToast, getFileSize } from '@/utils/'
const resume = ref(null)
const show = defineModel()
const user = inject('$user')
const application = defineModel('application')
const props = defineProps({
job: {
type: String,
required: true,
},
})
const validateFile = (file) => {
let extension = file.name.split('.').pop().toLowerCase()
if (extension != 'pdf') {
return 'Only PDF file is allowed'
}
}
const jobApplication = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'LMS Job Application',
user: user.data?.name,
resume: resume.value?.file_name,
job: props.job,
},
}
},
})
const submitResume = (close) => {
jobApplication.submit(
{},
{
validate() {
if (!resume.value) {
return 'Please upload your resume'
}
},
onSuccess() {
createToast({
title: 'Success',
text: 'Your application has been submitted',
icon: 'check',
iconClasses: 'bg-green-600 text-white rounded-md p-px',
})
application.value.reload()
close()
},
onError(err) {
createToast({
title: 'Error',
text: err.messages?.[0] || err,
icon: 'x',
iconClasses: 'bg-red-600 text-white rounded-md p-px',
position: 'top-center',
timeout: 10,
})
},
}
)
}
</script>

Some files were not shown because too many files have changed in this diff Show More