Compare commits

...

270 Commits

Author SHA1 Message Date
Frappe PR Bot
015aff9c4b chore(release): Bumped to Version 2.28.0 2025-05-07 07:48:16 +00:00
Jannat Patel
567bfc41e0 Merge pull request #1489 from pateljannat/issues-102
fix: misc fixes
2025-05-07 12:51:11 +05:30
Jannat Patel
90d77e9ffb fix: improved question form for quiz 2025-05-07 12:34:38 +05:30
Jannat Patel
2b33ba1984 fix: dark mode issues 2025-05-07 11:50:34 +05:30
Jannat Patel
1918f0c5d5 Merge branch 'develop' of https://github.com/frappe/lms into issues-102 2025-05-07 11:50:07 +05:30
Jannat Patel
91d79de723 fix: submission list access from assignment form 2025-05-06 20:02:34 +05:30
Jannat Patel
62b05f2377 fix: route to course from the course card widget 2025-05-06 19:25:53 +05:30
Jannat Patel
b628ec4c57 Merge pull request #1488 from pateljannat/simplify-persona-form
chore: simplified the persona form
2025-05-06 19:23:28 +05:30
Jannat Patel
494394f084 Merge pull request #1487 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-05-06 19:15:24 +05:30
Jannat Patel
e99b4b183c chore: simplified the persona form 2025-05-06 19:14:41 +05:30
Jannat Patel
9186353654 chore: Esperanto translations 2025-05-06 18:24:57 +05:30
Jannat Patel
bd2a7b9095 chore: Chinese Simplified translations 2025-05-06 18:24:55 +05:30
Jannat Patel
42b70e7a94 chore: Serbian (Latin) translations 2025-05-06 18:24:54 +05:30
Jannat Patel
7f913203a1 chore: Bosnian translations 2025-05-06 18:24:53 +05:30
Jannat Patel
9b94958840 chore: Croatian translations 2025-05-06 18:24:51 +05:30
Jannat Patel
2070e93379 chore: Thai translations 2025-05-06 18:24:50 +05:30
Jannat Patel
772f4d938f chore: Persian translations 2025-05-06 18:24:48 +05:30
Jannat Patel
531f3af203 chore: Portuguese, Brazilian translations 2025-05-06 18:24:47 +05:30
Jannat Patel
ed522341c1 chore: Turkish translations 2025-05-06 18:24:46 +05:30
Jannat Patel
ee59c5068e chore: Swedish translations 2025-05-06 18:24:44 +05:30
Jannat Patel
ebe3abd05b chore: Russian translations 2025-05-06 18:24:43 +05:30
Jannat Patel
358dd4dddc chore: Portuguese translations 2025-05-06 18:24:41 +05:30
Jannat Patel
3d924d3631 chore: Polish translations 2025-05-06 18:24:40 +05:30
Jannat Patel
0bed316a40 chore: Hungarian translations 2025-05-06 18:24:39 +05:30
Jannat Patel
24b5937793 chore: German translations 2025-05-06 18:24:37 +05:30
Jannat Patel
c5b5876700 chore: Arabic translations 2025-05-06 18:24:36 +05:30
Jannat Patel
0f969e952d chore: Spanish translations 2025-05-06 18:24:34 +05:30
Jannat Patel
43ba512fd5 chore: French translations 2025-05-06 18:24:33 +05:30
Jannat Patel
8aadbffe8c Merge pull request #1483 from pateljannat/issues-101
fix: misc fixes
2025-05-06 10:49:47 +05:30
Jannat Patel
be7e7bc6fd refactor: extracted function that enables plyr as a utility 2025-05-06 10:35:05 +05:30
Jannat Patel
3a10d4bdc0 fix: alignment of information on batch details 2025-05-06 10:17:07 +05:30
Jannat Patel
fc03ecd1b3 fix: made programs breadcrumb translatable 2025-05-06 09:27:48 +05:30
Jannat Patel
c7b10f0e83 Merge pull request #1482 from frappe/pot_develop_2025-05-02
chore: update POT file
2025-05-06 08:50:56 +05:30
Jannat Patel
6a94ce5e1c Merge pull request #1480 from pateljannat/evaluator-list-issue
fix: evaluator list in settings
2025-05-06 08:50:44 +05:30
frappe-pr-bot
59859a8e2f chore: update POT file 2025-05-02 16:04:11 +00:00
Jannat Patel
f51a8aae39 fix: evaluator list in settings 2025-05-02 15:03:54 +05:30
Jannat Patel
bd5b8c5e0e Merge pull request #1478 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-05-02 15:02:35 +05:30
Jannat Patel
67e7744566 Merge pull request #1479 from pateljannat/read-only
feat: read only mode
2025-04-30 18:33:22 +05:30
Jannat Patel
65a6663c31 fix: when moving between lessons in zen mode, ensure discussions remain hidden 2025-04-30 18:19:45 +05:30
Jannat Patel
603e80fd26 feat: read only mode 2025-04-30 18:03:00 +05:30
Jannat Patel
de4ee6bbe6 chore: Persian translations 2025-04-30 15:28:31 +05:30
Jannat Patel
a8aa242280 chore: Portuguese, Brazilian translations 2025-04-30 15:28:30 +05:30
Jannat Patel
0d32c2a9d9 Merge branch 'develop' of https://github.com/frappe/lms into read-only 2025-04-29 18:40:42 +05:30
Jannat Patel
6d5a02e2a8 feat: read only mode 2025-04-29 18:39:22 +05:30
Jannat Patel
67f3cbaaa8 Merge pull request #1475 from pateljannat/issues-100
fix: hide start learning button if self enrollment is disabled
2025-04-29 16:23:51 +05:30
Jannat Patel
f17504e1a0 fix: hide start learning button if self enrollment is disabled 2025-04-29 15:51:03 +05:30
Jannat Patel
b1a9af5de8 Merge pull request #1474 from pateljannat/issues-99
fix: check parenttype when fetching instructors
2025-04-29 11:27:56 +05:30
Jannat Patel
913bf553ae refactor: simplified the condition to check is user is instructor 2025-04-29 11:03:58 +05:30
Jannat Patel
356dcc42bf fix: check parenttype when fetching instructors 2025-04-29 10:48:52 +05:30
Jannat Patel
8c006f24ce Merge pull request #1465 from nextchamp-saqib/refactor-charts
refactor: use charts from `frappe-ui`
2025-04-28 18:19:16 +05:30
Jannat Patel
6f2f0092f0 refactor: dynamic data for statistics charts 2025-04-28 18:05:43 +05:30
Jannat Patel
56afc4c614 Merge pull request #1471 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-28 15:34:43 +05:30
Jannat Patel
0a3b9f8f9a chore: Esperanto translations 2025-04-28 14:01:56 +05:30
Jannat Patel
9b0623f4a4 chore: Bosnian translations 2025-04-28 14:01:55 +05:30
Jannat Patel
c13ef17a86 chore: Croatian translations 2025-04-28 14:01:54 +05:30
Jannat Patel
d5ac2f521f chore: Thai translations 2025-04-28 14:01:52 +05:30
Jannat Patel
037af18114 chore: Persian translations 2025-04-28 14:01:51 +05:30
Jannat Patel
92299458f5 chore: Portuguese, Brazilian translations 2025-04-28 14:01:49 +05:30
Jannat Patel
3272f2a4cf chore: Turkish translations 2025-04-28 14:01:48 +05:30
Jannat Patel
6a6dfdd82c chore: Swedish translations 2025-04-28 14:01:46 +05:30
Jannat Patel
fa27452983 chore: Russian translations 2025-04-28 14:01:45 +05:30
Jannat Patel
8df5ec41d5 chore: Portuguese translations 2025-04-28 14:01:43 +05:30
Jannat Patel
55aad3a742 chore: Polish translations 2025-04-28 14:01:42 +05:30
Jannat Patel
e46890d87e chore: Hungarian translations 2025-04-28 14:01:41 +05:30
Jannat Patel
3a36e10fce chore: German translations 2025-04-28 14:01:39 +05:30
Jannat Patel
cc30c6d271 chore: Arabic translations 2025-04-28 14:01:38 +05:30
Jannat Patel
5e75ff7fb7 chore: Spanish translations 2025-04-28 14:01:36 +05:30
Jannat Patel
80681a1f8b chore: French translations 2025-04-28 14:01:34 +05:30
Jannat Patel
5954e10155 chore: Serbian (Latin) translations 2025-04-28 14:01:32 +05:30
Jannat Patel
78c43b7a10 chore: Chinese Simplified translations 2025-04-28 14:01:31 +05:30
Jannat Patel
8c6f8bf97b Merge pull request #1470 from pateljannat/issues-98
fix: don't allow billing page access if batch has started
2025-04-28 12:38:13 +05:30
Jannat Patel
f220438257 fix: remove borders for iframe on lesson form 2025-04-28 11:16:04 +05:30
Jannat Patel
bbd06752d3 Merge pull request #1468 from frappe/pot_develop_2025-04-25
chore: update POT file
2025-04-28 10:36:31 +05:30
Jannat Patel
e34df2ce95 fix: don't allow billing page access if batch has started 2025-04-28 10:35:14 +05:30
frappe-pr-bot
b197c08716 chore: update POT file 2025-04-25 16:04:29 +00:00
Jannat Patel
aeb6c0f433 Merge branch 'develop' of https://github.com/frappe/lms into refactor-charts 2025-04-25 18:27:50 +05:30
Jannat Patel
8f32767267 Merge pull request #1461 from frappe/zen-mode
feat: Zen Mode
2025-04-25 18:21:31 +05:30
Jannat Patel
afd43b9a9a Merge branch 'develop' of https://github.com/frappe/lms into zen-mode 2025-04-25 17:49:13 +05:30
Jannat Patel
5893e02c48 fix: reduced the size of play button in video block 2025-04-25 17:49:07 +05:30
Jannat Patel
66d3325e3c Merge pull request #1467 from harshpwctech/develop
feat: Embedding for CloudflareStream
2025-04-25 17:29:35 +05:30
Jannat Patel
e513993a0d feat: show and hide discussions in zen mode 2025-04-25 17:28:54 +05:30
safe user
ddbdf42265 feat: Embedding Cloudflare Stream 2025-04-25 09:28:44 +00:00
safe user
badaa33ddb feat: Embedding for CloudflareStream 2025-04-25 08:38:00 +00:00
safe user
befa3d7a6d feat: Added embedding for CloudflareStream 2025-04-25 08:38:00 +00:00
Jannat Patel
513f1e8b86 fix: improved lesson locked state 2025-04-25 08:38:00 +00:00
Jannat Patel
4128f0fb73 chore: fixed settings 2025-04-25 08:38:00 +00:00
Jannat Patel
3d81a63410 ci: skip persona form for ui tests 2025-04-25 08:38:00 +00:00
Jannat Patel
c0ba44cacc fix: check persona_captured after details get saved 2025-04-25 08:38:00 +00:00
Jannat Patel
deba027457 chore: identify user persona 2025-04-25 08:38:00 +00:00
Jannat Patel
47089d286e chore: Serbian (Latin) translations 2025-04-25 08:38:00 +00:00
Jannat Patel
6c50292a66 fix: tags spacing on course cards 2025-04-25 08:38:00 +00:00
Jannat Patel
1f23f06926 fix: allow fullscreen on vimeo and adjust video height on mobile devices 2025-04-25 08:38:00 +00:00
Jannat Patel
63319d32e8 fix: detect editor change to enable plyr on newly added videos 2025-04-25 11:18:19 +05:30
Jannat Patel
66f28ef7a6 Merge branch 'develop' of https://github.com/frappe/lms into zen-mode 2025-04-25 10:20:38 +05:30
Jannat Patel
4e4eccd909 Merge pull request #1466 from pateljannat/issues-97
fix: country details in job page and form
2025-04-25 10:19:32 +05:30
Jannat Patel
c21fe99368 fix: country details in job page and form 2025-04-25 10:13:17 +05:30
Jannat Patel
53ea91e945 feat: plyr for vimeo 2025-04-25 10:05:32 +05:30
Jannat Patel
7cde05b58a Merge branch 'develop' of https://github.com/frappe/lms into zen-mode 2025-04-24 18:42:44 +05:30
Jannat Patel
0fc9b35307 Merge pull request #1464 from pateljannat/issues-96
feat: redesigned job list
2025-04-24 18:35:20 +05:30
Jannat Patel
4a36826af0 fix: if student applied for a job show that on the details page 2025-04-24 18:28:06 +05:30
Jannat Patel
26a278c5f4 feat: country filter in job list 2025-04-24 18:22:00 +05:30
Saqib Ansari
66a4d79730 refactor: use charts from frappe-ui 2025-04-24 16:19:12 +05:30
Jannat Patel
097d541391 feat: redesigned job list 2025-04-24 14:20:51 +05:30
Jannat Patel
788ef9b106 Merge pull request #1463 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-24 14:12:16 +05:30
Jannat Patel
a38e1163af chore: Chinese Simplified translations 2025-04-24 13:37:52 +05:30
Jannat Patel
a633ff5174 fix: check if youtube or vimeo video exists before enabling plyr 2025-04-24 12:06:57 +05:30
Jannat Patel
6b412106de feat: redesigned video block 2025-04-23 17:06:29 +05:30
Jannat Patel
93b5cb6161 feat: zen mode 2025-04-23 11:44:39 +05:30
Jannat Patel
4b80fbe5eb Merge pull request #1460 from pateljannat/issues-95
fix: improved lesson locked state
2025-04-22 18:13:01 +05:30
Jannat Patel
52775aae60 fix: improved lesson locked state 2025-04-22 18:05:07 +05:30
Jannat Patel
0430178b3e Merge pull request #1459 from pateljannat/user-persona
chore: identify user persona
2025-04-22 17:47:20 +05:30
Jannat Patel
470123c77a chore: fixed settings 2025-04-22 16:17:29 +05:30
Jannat Patel
66d4798db3 Merge branch 'develop' of https://github.com/frappe/lms into user-persona 2025-04-22 15:54:55 +05:30
Jannat Patel
cc39395a12 Merge pull request #1458 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-22 15:54:42 +05:30
Jannat Patel
3aeb9cf0b1 ci: skip persona form for ui tests 2025-04-22 15:32:01 +05:30
Jannat Patel
f1b383f0b7 fix: check persona_captured after details get saved 2025-04-22 15:02:21 +05:30
Jannat Patel
e2896b7bf0 chore: Serbian (Latin) translations 2025-04-22 12:52:49 +05:30
Jannat Patel
780dfb8966 Merge branch 'develop' of https://github.com/frappe/lms into user-persona 2025-04-21 18:07:12 +05:30
Jannat Patel
ac47ab3f8a Merge pull request #1456 from pateljannat/issues-94
fix: allow fullscreen on vimeo and adjust video height on mobile devices
2025-04-21 16:36:06 +05:30
Jannat Patel
bfc1488860 fix: tags spacing on course cards 2025-04-21 16:16:54 +05:30
Jannat Patel
726f733434 fix: allow fullscreen on vimeo and adjust video height on mobile devices 2025-04-21 15:41:51 +05:30
Jannat Patel
0c97e31101 Merge pull request #1455 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-21 15:07:47 +05:30
Jannat Patel
ec2b0718e6 chore: Portuguese translations 2025-04-21 12:09:04 +05:30
Jannat Patel
720056268c chore: Serbian (Latin) translations 2025-04-21 12:09:03 +05:30
Jannat Patel
345992eda4 chore: Esperanto translations 2025-04-21 12:09:02 +05:30
Jannat Patel
e3e6b35eb7 chore: Croatian translations 2025-04-21 12:09:00 +05:30
Jannat Patel
701ea950de chore: Thai translations 2025-04-21 12:08:59 +05:30
Jannat Patel
4b78865823 chore: Portuguese, Brazilian translations 2025-04-21 12:08:58 +05:30
Jannat Patel
5b2bdf4cf6 chore: Bosnian translations 2025-04-21 12:08:57 +05:30
Jannat Patel
a677b7fd3a chore: Persian translations 2025-04-21 12:08:55 +05:30
Jannat Patel
9cbd3db022 chore: Chinese Simplified translations 2025-04-21 12:08:54 +05:30
Jannat Patel
5f52d2c2c7 chore: Turkish translations 2025-04-21 12:08:53 +05:30
Jannat Patel
b8c403aa5d chore: Swedish translations 2025-04-21 12:08:52 +05:30
Jannat Patel
2c6863e18e chore: Russian translations 2025-04-21 12:08:50 +05:30
Jannat Patel
e7a462c685 chore: Polish translations 2025-04-21 12:08:49 +05:30
Jannat Patel
0cf671ae3b chore: Hungarian translations 2025-04-21 12:08:48 +05:30
Jannat Patel
dfc6f5bfb4 chore: German translations 2025-04-21 12:08:47 +05:30
Jannat Patel
64b9be7e42 chore: Arabic translations 2025-04-21 12:08:45 +05:30
Jannat Patel
7412a8761c chore: Spanish translations 2025-04-21 12:08:44 +05:30
Jannat Patel
65cdeabc77 chore: French translations 2025-04-21 12:08:42 +05:30
Jannat Patel
a507d4464d Merge pull request #1454 from pateljannat/issues-93
feat: meta image and keywords from settings
2025-04-21 11:05:39 +05:30
Jannat Patel
9143cc39d9 test: find the course image label and attach course image to its sibling input 2025-04-21 10:53:22 +05:30
Jannat Patel
e821755721 test: attach course image if selector is hidden 2025-04-21 10:33:24 +05:30
Jannat Patel
d081688fc9 Merge pull request #1453 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-21 10:16:30 +05:30
Jannat Patel
cdc7ee698c Merge pull request #1452 from frappe/pot_develop_2025-04-18
chore: update POT file
2025-04-21 09:55:00 +05:30
Jannat Patel
0d0a9c872c chore: Chinese Simplified translations 2025-04-20 11:58:27 +05:30
Jannat Patel
30953cce66 chore: German translations 2025-04-20 11:58:22 +05:30
Jannat Patel
f6008cf46a fix: don't show course count on batch details if there are no courses 2025-04-19 12:46:31 +05:30
Jannat Patel
eb0587f726 feat: meta image and keywords from settings 2025-04-19 12:37:24 +05:30
frappe-pr-bot
ba56ac87c5 chore: update POT file 2025-04-18 16:04:27 +00:00
Jannat Patel
5800ac67c4 chore: identify user persona 2025-04-18 18:05:57 +05:30
Jannat Patel
73941a159a Merge pull request #1451 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-18 16:16:35 +05:30
Jannat Patel
d1fe8b203a chore: Thai translations 2025-04-18 11:52:30 +05:30
Jannat Patel
8b8dbc1053 chore: Chinese Simplified translations 2025-04-18 11:52:28 +05:30
Jannat Patel
57e477b17c Merge pull request #1450 from pateljannat/issues-92
fix: moved powered by learning to the bottom of sidebar
2025-04-17 22:41:59 +05:30
Jannat Patel
1a1924de3e fix: removed styles on attachments as they were overriding the styles on webform 2025-04-17 22:32:25 +05:30
Jannat Patel
3bea19c8ad fix: moved powered by learning to the bottom of sidebar 2025-04-17 22:31:47 +05:30
Jannat Patel
cd47b62765 Merge pull request #1449 from pateljannat/assignment-issues
refactor: enhanced assignment form
2025-04-17 22:09:01 +05:30
Jannat Patel
ffeaad324e fix: removed assignment submission email notification 2025-04-17 22:03:07 +05:30
Jannat Patel
4504dd810d fix: make assignment modal scrollable if the questions is very long 2025-04-17 21:52:55 +05:30
Jannat Patel
60ad86f79c refactor: enhanced assignment form 2025-04-17 21:42:43 +05:30
Jannat Patel
f63294699a Merge pull request #1446 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-17 17:37:12 +05:30
Jannat Patel
650594d9ea Merge pull request #1447 from pateljannat/certification-redesign
fix: improved UI of certified participants page
2025-04-17 12:48:27 +05:30
Jannat Patel
7c22d5c774 chore: changed release workflow to run on the 15th of every month 2025-04-17 12:38:24 +05:30
Jannat Patel
73a501908d fix: mobile view for certified members page 2025-04-17 12:34:38 +05:30
Jannat Patel
31836e5c9e chore: Persian translations 2025-04-17 11:49:28 +05:30
Jannat Patel
31adab94b3 chore: merged conflicts 2025-04-16 21:38:00 +05:30
Jannat Patel
4e02044eb4 Merge pull request #1441 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-16 18:47:37 +05:30
Jannat Patel
f245cf2c5d fix: meta title for pages that don't have a default title 2025-04-16 17:09:09 +05:30
Jannat Patel
1b49cc1408 fix: meta title for pages that don't have a title 2025-04-16 17:02:52 +05:30
Jannat Patel
bd384a9b59 chore: Portuguese translations 2025-04-16 11:50:58 +05:30
Jannat Patel
48eb2ff405 fix: registration button should be visible if batch starts today but a few hours are left 2025-04-16 11:18:17 +05:30
Jannat Patel
dcacda984f fix: mobile view for certified member list 2025-04-16 10:59:06 +05:30
Jannat Patel
8186e9e1d2 Merge pull request #1438 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-15 20:14:15 +05:30
Jannat Patel
b5b93917d1 chore: Croatian translations 2025-04-15 11:50:27 +05:30
Jannat Patel
1ffdadbde3 chore: Bosnian translations 2025-04-15 11:50:25 +05:30
Jannat Patel
4506603ea1 chore: Swedish translations 2025-04-15 11:50:23 +05:30
Jannat Patel
fdf8b85f88 Merge branch 'develop' of https://github.com/frappe/lms into certification-redesign 2025-04-14 22:50:47 +05:30
Jannat Patel
340264ce41 Merge pull request #1436 from pateljannat/issues-91
fix: misc issues
2025-04-14 22:49:25 +05:30
Jannat Patel
d6187b3d63 fix: corrected grammar in payments app error message 2025-04-14 22:39:07 +05:30
Jannat Patel
b6577133a9 fix: misc issues 2025-04-14 22:28:06 +05:30
Jannat Patel
2d410eac37 Merge pull request #1430 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-14 16:24:43 +05:30
Jannat Patel
e63e71f2bf chore: Portuguese translations 2025-04-14 11:31:24 +05:30
Jannat Patel
ba743e0480 chore: Serbian (Latin) translations 2025-04-14 11:31:23 +05:30
Jannat Patel
2f26b15524 chore: Esperanto translations 2025-04-14 11:31:21 +05:30
Jannat Patel
5841ed0e70 chore: Croatian translations 2025-04-14 11:31:20 +05:30
Jannat Patel
d217dff4b9 chore: Thai translations 2025-04-14 11:31:18 +05:30
Jannat Patel
2746606db1 chore: Portuguese, Brazilian translations 2025-04-14 11:31:17 +05:30
Jannat Patel
2d321780d0 chore: Bosnian translations 2025-04-14 11:31:16 +05:30
Jannat Patel
c26108586f chore: Persian translations 2025-04-14 11:31:14 +05:30
Jannat Patel
7f30d9c3dc chore: Chinese Simplified translations 2025-04-14 11:31:12 +05:30
Jannat Patel
816b40bdc6 chore: Turkish translations 2025-04-14 11:31:11 +05:30
Jannat Patel
09688315cb chore: Swedish translations 2025-04-14 11:31:10 +05:30
Jannat Patel
c709535442 chore: Russian translations 2025-04-14 11:31:08 +05:30
Jannat Patel
08e2d804fa chore: Polish translations 2025-04-14 11:31:07 +05:30
Jannat Patel
b4fb07b435 chore: Hungarian translations 2025-04-14 11:31:06 +05:30
Jannat Patel
d119ae6409 chore: German translations 2025-04-14 11:31:04 +05:30
Jannat Patel
cf26fc4530 chore: Arabic translations 2025-04-14 11:31:03 +05:30
Jannat Patel
f50a7704c9 chore: Spanish translations 2025-04-14 11:31:02 +05:30
Jannat Patel
facec8393c chore: French translations 2025-04-14 11:31:00 +05:30
Jannat Patel
172e8872ef Merge pull request #1428 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-14 10:57:06 +05:30
Jannat Patel
b7755b844a Merge pull request #1427 from frappe/pot_develop_2025-04-11
chore: update POT file
2025-04-14 10:56:54 +05:30
Jannat Patel
7e77d29edb chore: Portuguese translations 2025-04-13 11:08:49 +05:30
Jannat Patel
3b84ef6968 fix: seo description for job openings 2025-04-13 10:26:59 +05:30
Jannat Patel
2dd8192dcb feat: list of certified participants 2025-04-13 10:14:00 +05:30
Jannat Patel
cafb499a79 chore: Portuguese translations 2025-04-12 10:51:50 +05:30
Jannat Patel
f952267396 chore: Arabic translations 2025-04-12 10:51:38 +05:30
frappe-pr-bot
6913b71c69 chore: update POT file 2025-04-11 16:04:23 +00:00
Jannat Patel
c485b03b83 chore: merged conflicts 2025-04-11 19:01:46 +05:30
Jannat Patel
e1f35c86db fix: empty meta info issue 2025-04-11 18:43:34 +05:30
Jannat Patel
cfbe60b731 fix: improved UI of certified participants page 2025-04-11 18:36:12 +05:30
Jannat Patel
a21020e226 Merge pull request #1425 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-11 13:21:11 +05:30
Jannat Patel
28d18102f0 chore: Serbian (Latin) translations 2025-04-11 10:37:08 +05:30
Jannat Patel
f5e78b7fdb chore: Persian translations 2025-04-11 10:37:04 +05:30
Jannat Patel
d420b2dae5 chore: Turkish translations 2025-04-11 10:37:01 +05:30
Jannat Patel
3cce9107d0 chore: Polish translations 2025-04-11 10:36:59 +05:30
Jannat Patel
a5248eb92b chore: Hungarian translations 2025-04-11 10:36:57 +05:30
Jannat Patel
1acf734229 chore: German translations 2025-04-11 10:36:56 +05:30
Jannat Patel
cc170ecb20 chore: French translations 2025-04-11 10:36:53 +05:30
Jannat Patel
b7f40d16a4 Merge pull request #1424 from pateljannat/seo-description
feat: SEO Meta Description
2025-04-10 17:42:58 +05:30
Jannat Patel
7e6cb727bd feat: seo description field 2025-04-10 17:19:38 +05:30
Jannat Patel
eeaa835bef fix: redirect to course list from course from if user is not moderator and instructor 2025-04-10 16:36:22 +05:30
Frappe PR Bot
04aff8d149 chore(release): Bumped to Version 2.27.0 2025-04-10 10:38:37 +00:00
Jannat Patel
e88bdd818d Merge pull request #1422 from pateljannat/issues-89
fix: don't update onboarding status if user is not system manager
2025-04-10 15:55:32 +05:30
Jannat Patel
1a5d8ce07e fix: don't update onboarding status if user is not system manager 2025-04-10 15:37:59 +05:30
Jannat Patel
8e405bc8eb Merge pull request #1416 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-09 15:01:24 +05:30
Jannat Patel
23e2a153c9 chore: German translations 2025-04-09 10:03:41 +05:30
Jannat Patel
85a0949488 Merge pull request #1415 from pateljannat/jobs-improvements
fix: new ui for job list
2025-04-08 22:53:30 +05:30
Jannat Patel
57b6433dc0 fix: new ui for job list 2025-04-08 22:39:42 +05:30
Jannat Patel
1b43e1be44 fix: added back csrf_token 2025-04-08 21:33:52 +05:30
Jannat Patel
d6738b86c9 Merge pull request #1414 from pateljannat/seo-improvements
fix: seo improvements
2025-04-08 21:09:54 +05:30
Jannat Patel
a5325cef44 chore: renamed lint jobs 2025-04-08 21:03:30 +05:30
Jannat Patel
cc917f3d83 chore: bumped up pre commit action version to 3.0. 2025-04-08 21:00:50 +05:30
Jannat Patel
492917ea40 chore: added commit lint rules 2025-04-08 20:53:44 +05:30
Jannat Patel
78263185a1 chore: cached pip for linters 2025-04-08 20:31:42 +05:30
Jannat Patel
ee7aa9d58b feat: fetch meta tags from website route meta 2025-04-08 19:37:16 +05:30
Jannat Patel
a7112937de fix: changed course and batch meta description 2025-04-08 18:21:28 +05:30
Jannat Patel
a8d4572aef fix: add app_name as document title 2025-04-08 18:12:21 +05:30
Jannat Patel
45c530e53a Merge pull request #1413 from pateljannat/improve-page-meta
fix: persistent favicon for all pages
2025-04-08 11:52:23 +05:30
Jannat Patel
e0bcce5e6e fix: show learning logo as favicon if its missing in website settings 2025-04-08 11:45:51 +05:30
Jannat Patel
8346ec8525 fix: import usePageMeta for QuizSubmission 2025-04-08 11:13:46 +05:30
Jannat Patel
5d1673bad8 fix: persistent favicon for all pages 2025-04-08 10:57:02 +05:30
Jannat Patel
a33328e11d Merge pull request #1412 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-08 10:27:35 +05:30
Jannat Patel
3efa326684 chore: Esperanto translations 2025-04-08 09:28:34 +05:30
Jannat Patel
196fead1e0 chore: Croatian translations 2025-04-08 09:28:33 +05:30
Jannat Patel
b8ce04e9fe chore: Thai translations 2025-04-08 09:28:31 +05:30
Jannat Patel
6369dfd65c chore: Portuguese, Brazilian translations 2025-04-08 09:28:30 +05:30
Jannat Patel
f4da56adf9 chore: Bosnian translations 2025-04-08 09:28:29 +05:30
Jannat Patel
0987a91bfc chore: Persian translations 2025-04-08 09:28:27 +05:30
Jannat Patel
9f23a56cf4 chore: Chinese Simplified translations 2025-04-08 09:28:26 +05:30
Jannat Patel
34a4754767 chore: Turkish translations 2025-04-08 09:28:25 +05:30
Jannat Patel
b88de74552 chore: Swedish translations 2025-04-08 09:28:24 +05:30
Jannat Patel
45ac682c7f chore: Russian translations 2025-04-08 09:28:22 +05:30
Jannat Patel
b753d366bf chore: Polish translations 2025-04-08 09:28:21 +05:30
Jannat Patel
06c598886e chore: Hungarian translations 2025-04-08 09:28:20 +05:30
Jannat Patel
52b0b7f8dc chore: German translations 2025-04-08 09:28:18 +05:30
Jannat Patel
656b3b2ebe chore: Arabic translations 2025-04-08 09:28:17 +05:30
Jannat Patel
6bdfbde23f chore: Spanish translations 2025-04-08 09:28:16 +05:30
Jannat Patel
1b9f5eebc0 chore: French translations 2025-04-08 09:28:15 +05:30
Jannat Patel
1f37da08b4 Merge pull request #1411 from pateljannat/disable-signup-settings
feat: signups can now be enabled/disabled from portal settings
2025-04-07 18:22:57 +05:30
Jannat Patel
5bc44e6fe5 feat: signups can now be enabled/disabled from portal settings 2025-04-07 18:15:30 +05:30
Jannat Patel
c70da08078 Merge pull request #1410 from pateljannat/quiz-issue
fix: save lesson details in quiz
2025-04-07 15:19:15 +05:30
Jannat Patel
7600fb14e1 Merge pull request #1409 from frappe/pot_develop_2025-04-04
chore: update POT file
2025-04-07 15:10:55 +05:30
Jannat Patel
e2fdf2042e Merge pull request #1406 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-04-07 15:10:38 +05:30
Jannat Patel
8477d6b9ed fix: save lesson details in quiz 2025-04-07 15:09:31 +05:30
Jannat Patel
241df63334 chore: Persian translations 2025-04-07 09:31:08 +05:30
Jannat Patel
7131de8a2a chore: Persian translations 2025-04-06 09:34:34 +05:30
frappe-pr-bot
473a799f58 chore: update POT file 2025-04-04 16:04:26 +00:00
Jannat Patel
6c9fe85170 chore: Portuguese, Brazilian translations 2025-04-01 09:07:24 +05:30
Jannat Patel
2c5d2db340 chore: Chinese Simplified translations 2025-03-29 08:33:34 +05:30
134 changed files with 30416 additions and 10235 deletions

View File

@@ -7,8 +7,27 @@ on:
branches: [ main ]
jobs:
commit-lint:
name: 'Semantic Commits'
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 200
- uses: actions/setup-node@v4
with:
node-version: 20
check-latest: true
- name: Check commit titles
run: |
npm install @commitlint/cli @commitlint/config-conventional
npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}
linters:
name: Semantic Commits
name: Semgrep Rules
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
@@ -20,8 +39,17 @@ jobs:
with:
python-version: '3.10'
- name: Cache pip
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Install and Run Pre-commit
uses: pre-commit/action@v2.0.3
uses: pre-commit/action@v3.0.1
- name: Download Semgrep rules
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules

View File

@@ -1,8 +1,7 @@
name: Create weekly release
on:
schedule:
# 13:00 UTC -> 7pm IST on every Wednesday
- cron: '30 4 * * 3'
- cron: '30 4 15 * *'
workflow_dispatch:
jobs:

View File

@@ -70,7 +70,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -79,7 +79,7 @@ jobs:
${{ runner.os }}-yarn-ui-
- name: Cache cypress binary
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress
@@ -100,6 +100,7 @@ jobs:
bench --site lms.test execute frappe.utils.install.complete_setup_wizard
bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user
bench --site lms.test set-password frappe@example.com admin
bench --site lms.test execute lms.lms.utils.persona_captured
- name: cypress pre-requisites
run: |

26
commitlint.config.js Normal file
View File

@@ -0,0 +1,26 @@
module.exports = {
parserPreset: "conventional-changelog-conventionalcommits",
rules: {
"subject-empty": [2, "never"],
"type-case": [2, "always", "lower-case"],
"type-empty": [2, "never"],
"type-enum": [
2,
"always",
[
"build",
"chore",
"ci",
"docs",
"feat",
"fix",
"perf",
"refactor",
"revert",
"style",
"test",
"deprecate", // deprecation decision
],
],
},
};

View File

@@ -13,6 +13,6 @@ module.exports = defineConfig({
openMode: 0,
},
e2e: {
baseUrl: "http://testui:8000",
baseUrl: "http://pertest:8000",
},
});

View File

@@ -19,12 +19,16 @@ describe("Course Creation", () => {
);
cy.fixture("profile.png", "base64").then((fileContent) => {
cy.get('input[type="file"]').attachFile({
fileContent,
fileName: "profile.png",
mimeType: "image/png",
encoding: "base64",
});
cy.get("div")
.contains("Course Image")
.siblings("div")
.children('input[type="file"]')
.attachFile({
fileContent,
fileName: "profile.png",
mimeType: "image/png",
encoding: "base64",
});
});
cy.get("label")

Submodule frappe-ui deleted from 704a098eb1

View File

@@ -16,6 +16,7 @@ declare module 'vue' {
AssessmentPlugin: typeof import('./src/components/AssessmentPlugin.vue')['default']
Assessments: typeof import('./src/components/Assessments.vue')['default']
Assignment: typeof import('./src/components/Assignment.vue')['default']
AssignmentForm: typeof import('./src/components/Modals/AssignmentForm.vue')['default']
AudioBlock: typeof import('./src/components/AudioBlock.vue')['default']
Autocomplete: typeof import('./src/components/Controls/Autocomplete.vue')['default']
BatchCard: typeof import('./src/components/BatchCard.vue')['default']
@@ -68,9 +69,9 @@ declare module 'vue' {
NoPermission: typeof import('./src/components/NoPermission.vue')['default']
NoSidebarLayout: typeof import('./src/components/NoSidebarLayout.vue')['default']
NotPermitted: typeof import('./src/components/NotPermitted.vue')['default']
OnboardingBanner: typeof import('./src/components/OnboardingBanner.vue')['default']
PageModal: typeof import('./src/components/Modals/PageModal.vue')['default']
PaymentSettings: typeof import('./src/components/PaymentSettings.vue')['default']
Play: typeof import('./src/components/Icons/Play.vue')['default']
ProgressBar: typeof import('./src/components/ProgressBar.vue')['default']
Question: typeof import('./src/components/Modals/Question.vue')['default']
Quiz: typeof import('./src/components/Quiz.vue')['default']

View File

@@ -2,9 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="{{ favicon or '/assets/lms/frontend/favicon.png' }}" />
<link rel="icon" href="{{ favicon }}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Frappe Learning</title>
<title>{{ title }}</title>
<meta name="title" content="{{ meta.title }}" />
<meta name="image" content="{{ meta.image }}" />
<meta name="description" content="{{ meta.description }}" />
@@ -23,26 +23,10 @@
<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 }}'
window.setup_complete = '{{ setup_complete }}'
document.getElementById('seo-content').style.display = 'none';
</script>
<script type="module" src="/src/main.js"></script>

View File

@@ -26,11 +26,12 @@
"codemirror-editor-vue3": "^2.8.0",
"dayjs": "^1.11.6",
"feather-icons": "^4.28.0",
"frappe-ui": "^0.1.122",
"frappe-ui": "^0.1.134",
"highlight.js": "^11.11.1",
"lucide-vue-next": "^0.383.0",
"markdown-it": "^14.0.0",
"pinia": "^2.0.33",
"plyr": "^3.7.8",
"socket.io-client": "^4.7.2",
"tailwindcss": "3.4.15",
"typescript": "^5.7.2",

View File

@@ -0,0 +1,4 @@
<svg width="80" height="79" viewBox="0 0 80 79" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M57.1285 0.580383H22.8514C10.2309 0.580383 0 10.5649 0 22.8815V56.3332C0 68.6497 10.2309 78.6343 22.8514 78.6343H57.1285C69.749 78.6343 79.9799 68.6497 79.9799 56.3332V22.8815C79.9799 10.5649 69.749 0.580383 57.1285 0.580383Z" fill="#0E7159"/>
<path d="M62.8434 23.6906L60.7869 23.1052C53.6744 21.0702 45.9048 22.4641 39.992 26.8128C35.8502 23.7742 30.7943 22.1854 25.7099 22.2133H17.1406V27.8163H25.7099C29.6232 27.8163 33.508 29.015 36.6787 31.3845L39.992 33.8377L43.3056 31.3845C47.2475 28.4575 52.3032 27.2588 57.1306 28.0393V50.647C51.1035 49.9223 44.9051 51.4834 39.992 55.0795C35.8502 52.0688 30.8515 50.4798 25.7671 50.4798C24.7959 50.4798 23.8247 50.5355 22.8535 50.647V35.0642H17.1406V57.0588H62.8434V23.7185V23.6906Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 856 B

View File

@@ -24,7 +24,7 @@ const router = useRouter()
const noSidebar = ref(false)
router.beforeEach((to, from, next) => {
if (to.query.fromLesson) {
if (to.query.fromLesson || to.path === '/persona') {
noSidebar.value = true
} else {
noSidebar.value = false

View File

@@ -39,7 +39,11 @@
{{ __('More') }}
</span>
</div>
<Button v-if="isModerator" variant="ghost" @click="openPageModal()">
<Button
v-if="isModerator && !readOnlyMode"
variant="ghost"
@click="openPageModal()"
>
<template #icon>
<Plus class="h-4 w-4 text-ink-gray-7 stroke-1.5" />
</template>
@@ -63,6 +67,16 @@
</div>
</div>
<div class="m-2 flex flex-col gap-1">
<div
v-if="readOnlyMode && !sidebarStore.isSidebarCollapsed"
class="z-10 m-2 bg-surface-modal py-2.5 px-3 text-xs text-ink-gray-7 leading-5 rounded-md"
>
{{
__(
'This site is being updated. You will not be able to make any changes. Full access will be restored shortly.'
)
}}
</div>
<TrialBanner
v-if="
userResource.data?.is_system_manager && userResource.data?.is_fc_site
@@ -74,43 +88,69 @@
:isSidebarCollapsed="sidebarStore.isSidebarCollapsed"
appName="learning"
/>
<SidebarLink
v-if="isOnboardingStepsCompleted"
:link="{
label: __('Help'),
}"
:isCollapsed="sidebarStore.isSidebarCollapsed"
@click="
() => {
showHelpModal = minimize ? true : !showHelpModal
minimize = !showHelpModal
}
<div
class="flex items-center mt-4"
:class="
sidebarStore.isSidebarCollapsed ? 'flex-col space-y-3' : 'flex-row'
"
>
<template #icon>
<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
<CircleHelp class="h-4 w-4 stroke-1.5" />
</span>
</template>
</SidebarLink>
<SidebarLink
:link="{
label: sidebarStore.isSidebarCollapsed ? 'Expand' : 'Collapse',
}"
:isCollapsed="sidebarStore.isSidebarCollapsed"
@click="toggleSidebar()"
>
<template #icon>
<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
<CollapseSidebar
class="h-4 w-4 text-ink-gray-7 duration-300 ease-in-out"
:class="{
'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
}"
<div
class="flex items-center flex-1"
:class="
sidebarStore.isSidebarCollapsed
? 'flex-col space-y-3'
: 'flex-row space-x-3'
"
>
<Tooltip v-if="readOnlyMode && sidebarStore.isSidebarCollapsed">
<CircleAlert
class="size-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
/>
</span>
</template>
</SidebarLink>
<template #body>
<div
class="max-w-[30ch] rounded bg-surface-gray-7 px-2 py-1 text-center text-p-xs text-ink-white shadow-xl"
>
{{
__(
'This site is being updated. You will not be able to make any changes. Full access will be restored shortly.'
)
}}
</div>
</template>
</Tooltip>
<Tooltip :text="__('Powered by Learning')">
<Zap
class="size-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
@click="redirectToWebsite()"
/>
</Tooltip>
<Tooltip :text="__('Help')">
<CircleHelp
class="size-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
@click="
() => {
showHelpModal = minimize ? true : !showHelpModal
minimize = !showHelpModal
}
"
/>
</Tooltip>
</div>
<Tooltip
:text="
sidebarStore.isSidebarCollapsed ? __('Expand') : __('Collapse')
"
>
<CollapseSidebar
class="size-4 text-ink-gray-7 duration-300 stroke-1.5 ease-in-out cursor-pointer"
:class="{
'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
}"
@click="toggleSidebar()"
/>
</Tooltip>
</div>
</div>
<HelpModal
v-if="showOnboarding && showHelpModal"
@@ -148,7 +188,7 @@ import { usersStore } from '@/stores/user'
import { sessionStore } from '@/stores/session'
import { useSidebar } from '@/stores/sidebar'
import { useSettings } from '@/stores/settings'
import { Button, createResource } from 'frappe-ui'
import { Button, createResource, Tooltip } from 'frappe-ui'
import PageModal from '@/components/Modals/PageModal.vue'
import { capture } from '@/telemetry'
import LMSLogo from '@/components/Icons/LMSLogo.vue'
@@ -156,6 +196,7 @@ import { useRouter } from 'vue-router'
import InviteIcon from './Icons/InviteIcon.vue'
import {
BookOpen,
CircleAlert,
ChevronRight,
Plus,
CircleHelp,
@@ -164,6 +205,7 @@ import {
UserPlus,
Users,
BookText,
Zap,
} from 'lucide-vue-next'
import {
TrialBanner,
@@ -192,6 +234,7 @@ const currentStep = ref({})
const router = useRouter()
let onboardingDetails
let isOnboardingStepsCompleted = false
const readOnlyMode = window.read_only_mode
const iconProps = {
strokeWidth: 1.5,
width: 16,
@@ -578,4 +621,8 @@ watch(userResource, () => {
setUpOnboarding()
}
})
const redirectToWebsite = () => {
window.open('https://frappe.io/learning', '_blank')
}
</script>

View File

@@ -3,7 +3,7 @@
<template #target="{ togglePopover }">
<button
:class="[
'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-ink-gray-8 hover:bg-surface-gray-2',
'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-ink-gray-7 hover:bg-surface-gray-2',
]"
@click.prevent="togglePopover()"
>

View File

@@ -4,7 +4,7 @@
<div class="text-lg font-semibold text-ink-gray-9">
{{ __('Assessments') }}
</div>
<Button v-if="canSeeAddButton()" @click="showModal = true">
<Button v-if="canAddAssessments()" @click="showModal = true">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
@@ -100,6 +100,7 @@ import { Plus, Trash2 } from 'lucide-vue-next'
const user = inject('$user')
const showModal = ref(false)
const readOnlyMode = window.read_only_mode
const props = defineProps({
batch: {
@@ -181,7 +182,8 @@ const getRowRoute = (row) => {
}
}
const canSeeAddButton = () => {
const canAddAssessments = () => {
if (readOnlyMode) return false
return user.data?.is_moderator || user.data?.is_evaluator
}

View File

@@ -1,6 +1,6 @@
<template>
<div
class="flex flex-col border-2 hover:bg-surface-gray-2 rounded-md p-4 h-full"
class="flex flex-col border hover:border-outline-gray-4 rounded-md p-4 h-full"
style="min-height: 150px"
>
<div class="text-lg leading-5 font-semibold mb-2 text-ink-gray-9">

View File

@@ -89,6 +89,7 @@ import {
} from 'frappe-ui'
import { Plus, Trash2 } from 'lucide-vue-next'
import { showToast } from '@/utils'
const readOnlyMode = window.read_only_mode
const showCourseModal = ref(false)
const user = inject('$user')
@@ -159,6 +160,9 @@ const removeCourses = (selections, unselectAll) => {
}
const canSeeAddButton = () => {
if (readOnlyMode) {
return false
}
return user.data?.is_moderator || user.data?.is_evaluator
}
</script>

View File

@@ -111,7 +111,6 @@ import {
FormControl,
ListView,
ListHeader,
ListHeaderItem,
ListRows,
ListRow,
ListRowItem,

View File

@@ -24,7 +24,10 @@
>
{{ formatNumberIntoCurrency(batch.data.amount, batch.data.currency) }}
</div>
<div class="flex items-center mb-3 text-ink-gray-7">
<div
v-if="batch.data.courses.length"
class="flex items-center mb-3 text-ink-gray-7"
>
<BookOpen class="h-4 w-4 stroke-1.5 mr-2" />
<span> {{ batch.data.courses.length }} {{ __('Courses') }} </span>
</div>
@@ -46,68 +49,70 @@
{{ batch.data.timezone }}
</span>
</div>
<router-link
v-if="isModerator || isStudent"
:to="{
name: 'Batch',
params: {
batchName: batch.data.name,
},
}"
>
<Button variant="solid" class="w-full mt-4">
<span>
{{ isModerator ? __('Manage Batch') : __('Visit Batch') }}
</span>
<div v-if="!readOnlyMode">
<router-link
v-if="isModerator || isStudent"
:to="{
name: 'Batch',
params: {
batchName: batch.data.name,
},
}"
>
<Button variant="solid" class="w-full mt-4">
<span>
{{ isModerator ? __('Manage Batch') : __('Visit Batch') }}
</span>
</Button>
</router-link>
<router-link
:to="{
name: 'Billing',
params: {
type: 'batch',
name: batch.data.name,
},
}"
v-else-if="
batch.data.paid_batch &&
batch.data.seats_left > 0 &&
batch.data.accept_enrollments
"
>
<Button v-if="!isStudent" 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 &&
batch.data.seats_left &&
batch.data.accept_enrollments
"
@click="enrollInBatch()"
>
{{ __('Enroll Now') }}
</Button>
</router-link>
<router-link
:to="{
name: 'Billing',
params: {
type: 'batch',
name: batch.data.name,
},
}"
v-else-if="
batch.data.paid_batch &&
batch.data.seats_left > 0 &&
batch.data.accept_enrollments
"
>
<Button v-if="!isStudent" 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 &&
batch.data.seats_left &&
batch.data.accept_enrollments
"
@click="enrollInBatch()"
>
{{ __('Enroll Now') }}
</Button>
<router-link
v-if="isModerator"
:to="{
name: 'BatchForm',
params: {
batchName: batch.data.name,
},
}"
>
<Button class="w-full mt-2">
<span>
{{ __('Edit') }}
</span>
</Button>
</router-link>
<router-link
v-if="isModerator"
:to="{
name: 'BatchForm',
params: {
batchName: batch.data.name,
},
}"
>
<Button class="w-full mt-2">
<span>
{{ __('Edit') }}
</span>
</Button>
</router-link>
</div>
</div>
</template>
<script setup>
@@ -120,7 +125,7 @@ import { useRouter } from 'vue-router'
const router = useRouter()
const user = inject('$user')
const dayjs = inject('$dayjs')
const readOnlyMode = window.read_only_mode
const props = defineProps({
batch: {

View File

@@ -110,7 +110,7 @@
<div class="text-ink-gray-7 font-medium">
{{ __('Students') }}
</div>
<Button @click="openStudentModal()">
<Button v-if="!readOnlyMode" @click="openStudentModal()">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
@@ -247,6 +247,7 @@ const chartData = ref(null)
const chartOptions = ref(null)
const showProgressChart = ref(false)
const assessmentCount = ref(0)
const readOnlyMode = window.read_only_mode
const props = defineProps({
batch: {

View File

@@ -28,9 +28,7 @@
</template>
<template #body="{ isOpen }">
<div v-show="isOpen">
<div
class="mt-1 rounded-lg bg-surface-white py-1 text-base shadow-2xl"
>
<div class="mt-1 rounded-lg bg-surface-white py-1 text-base border-2">
<div class="relative px-1.5 pt-0.5">
<ComboboxInput
ref="search"
@@ -49,7 +47,7 @@
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" />
<X class="h-4 w-4 stroke-1.5 text-ink-gray-7" />
</button>
</div>
<ComboboxOptions
@@ -89,7 +87,7 @@
name="item-label"
v-bind="{ active, selected, option }"
>
<div class="flex flex-col space-y-1">
<div class="flex flex-col space-y-1 text-ink-gray-8">
<div>
{{ option.label }}
</div>

View File

@@ -146,7 +146,6 @@ function resetEditor(value: string, resetHistory = false) {
value = getModelValue()
aceEditor?.setValue(value)
aceEditor?.clearSelection()
console.log(isDark.value)
aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
props.autofocus && aceEditor?.focus()
if (resetHistory) {

View File

@@ -4,7 +4,7 @@
{{ label }}
<span class="text-ink-red-3" v-if="required">*</span>
</label>
<div class="grid grid-cols-3 gap-1">
<div class="grid grid-cols-3 gap-2">
<Button
ref="emails"
v-for="value in values"
@@ -12,7 +12,7 @@
:label="value"
theme="gray"
variant="subtle"
class="rounded-md"
class="rounded-md word-break-all"
@keydown.delete.capture.stop="removeLastValue"
>
<template #suffix>
@@ -42,7 +42,7 @@
<template #body="{ isOpen }">
<div v-show="isOpen">
<div
class="mt-1 rounded-lg bg-surface-white py-1 text-base shadow-2xl"
class="mt-1 rounded-lg bg-surface-white py-1 text-base border-2"
>
<ComboboxOptions
class="my-1 max-h-[12rem] overflow-y-auto px-1.5"
@@ -61,7 +61,7 @@
]"
>
<div class="flex flex-col gap-1 p-1">
<div class="text-base font-medium">
<div class="text-base font-medium text-ink-gray-8">
{{ option.description }}
</div>
<div class="text-sm text-ink-gray-5">

View File

@@ -9,16 +9,20 @@
:class="{ 'default-image': !course.image }"
:style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }"
>
<div
class="flex items-center flex-wrap space-x-1 relative top-4 px-2 w-fit"
>
<Badge v-if="course.featured" variant="subtle" theme="green" size="md">
<div class="flex items-center flex-wrap relative top-4 px-2 w-fit">
<Badge
v-if="course.featured"
variant="subtle"
theme="green"
size="md"
class="mb-1 mr-1"
>
{{ __('Featured') }}
</Badge>
<div
v-if="course.tags"
v-for="tag in course.tags?.split(', ')"
class="text-xs bg-white text-gray-800 px-2 py-0.5 rounded-md"
class="text-xs bg-white text-gray-800 px-2 py-0.5 rounded-md mb-1 mr-1"
>
{{ tag }}
</div>

View File

@@ -9,88 +9,94 @@
<div v-if="course.data.paid_course" class="text-2xl font-semibold mb-3">
{{ course.data.price }}
</div>
<div v-if="course.data.membership" class="space-y-2">
<div v-if="!readOnlyMode">
<div v-if="course.data.membership" class="space-y-2">
<router-link
: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>
<CertificationLinks :courseName="course.data.name" class="w-full" />
</div>
<router-link
v-else-if="course.data.paid_course"
:to="{
name: 'Lesson',
name: 'Billing',
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,
type: 'course',
name: course.data.name,
},
}"
>
<Button variant="solid" size="md" class="w-full">
<span>
{{ __('Continue Learning') }}
{{ __('Buy this course') }}
</span>
</Button>
</router-link>
<CertificationLinks :courseName="course.data.name" class="w-full" />
</div>
<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">
<Badge
v-else-if="course.data.disable_self_learning"
theme="blue"
size="lg"
>
{{ __('Contact the Administrator to enroll for this course.') }}
</Badge>
<Button
v-else
@click="enrollStudent()"
variant="solid"
class="w-full"
size="md"
>
<span>
{{ __('Buy this course') }}
{{ __('Start Learning') }}
</span>
</Button>
</router-link>
<div
v-else-if="course.data.disable_self_learning"
class="bg-surface-blue-2 text-blue-900 text-sm rounded-md py-1 px-3"
>
{{ __('Contact the Administrator to enroll for this course.') }}
</div>
<Button
v-else
@click="enrollStudent()"
variant="solid"
class="w-full"
size="md"
>
<span>
{{ __('Start Learning') }}
</span>
</Button>
<Button
v-if="canGetCertificate"
@click="fetchCertificate()"
variant="subtle"
class="w-full mt-2"
size="md"
>
{{ __('Get Certificate') }}
</Button>
<router-link
v-if="user?.data?.is_moderator || is_instructor()"
:to="{
name: 'CourseForm',
params: {
courseName: course.data.name,
},
}"
>
<Button variant="subtle" class="w-full mt-2" size="md">
<span>
{{ __('Edit') }}
</span>
<Button
v-if="canGetCertificate"
@click="fetchCertificate()"
variant="subtle"
class="w-full mt-2"
size="md"
>
{{ __('Get Certificate') }}
</Button>
</router-link>
<router-link
v-if="user?.data?.is_moderator || is_instructor()"
:to="{
name: 'CourseForm',
params: {
courseName: course.data.name,
},
}"
>
<Button variant="subtle" class="w-full mt-2" size="md">
<span>
{{ __('Edit') }}
</span>
</Button>
</router-link>
</div>
<div class="space-y-4">
<div class="mt-8 font-medium text-ink-gray-9">
<div
class="font-medium text-ink-gray-9"
:class="{ 'mt-8': !readOnlyMode }"
>
{{ __('This course has:') }}
</div>
<div class="flex items-center text-ink-gray-9">
@@ -140,7 +146,7 @@
<script setup>
import { BookOpen, Users, Star, GraduationCap } from 'lucide-vue-next'
import { computed, inject } from 'vue'
import { Button, createResource, Tooltip } from 'frappe-ui'
import { Badge, Button, createResource } from 'frappe-ui'
import { showToast, formatAmount } from '@/utils/'
import { capture } from '@/telemetry'
import { useRouter } from 'vue-router'
@@ -148,6 +154,7 @@ import CertificationLinks from '@/components/CertificationLinks.vue'
const router = useRouter()
const user = inject('$user')
const readOnlyMode = window.read_only_mode
const props = defineProps({
course: {
@@ -172,7 +179,7 @@ function enrollStudent() {
)
setTimeout(() => {
window.location.href = `/login?redirect-to=${window.location.pathname}`
}, 2000)
}, 1000)
} else {
const enrollStudentResource = createResource({
url: 'lms.lms.doctype.lms_enrollment.lms_enrollment.create_membership',

View File

@@ -1,5 +1,5 @@
<template>
<div class="h-full">
<div class="">
<div
v-if="title && (outline.data?.length || allowEdit)"
class="flex items-center justify-between space-x-2 mb-4 px-2"
@@ -17,9 +17,6 @@
<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="{
@@ -142,6 +139,7 @@
</div>
</div>
<ChapterModal
v-if="user.data"
v-model="showChapterModal"
v-model:outline="outline"
:course="courseName"

View File

@@ -27,7 +27,9 @@
</span>
</div>
<Dropdown
v-if="user.data.name == reply.owner && !reply.editable"
v-if="
user.data.name == reply.owner && !reply.editable && !readOnlyMode
"
:options="[
{
label: 'Edit',
@@ -71,7 +73,7 @@
</div>
<TextEditor
v-if="renderEditor"
v-if="renderEditor && !readOnlyMode"
class="mt-5"
:content="newReply"
:mentions="mentionUsers"
@@ -80,7 +82,7 @@
: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-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none border border-outline-gray-2 rounded-b-md min-h-[7rem] py-1 px-2"
/>
<div class="flex justify-between mt-2">
<div v-if="!readOnlyMode" class="flex justify-between mt-2">
<span> </span>
<Button @click="postReply()">
<span>
@@ -105,6 +107,7 @@ const user = inject('$user')
const allUsers = inject('$allUsers')
const mentionUsers = ref([])
const renderEditor = ref(false)
const readOnlyMode = window.read_only_mode
const props = defineProps({
topic: {

View File

@@ -1,6 +1,10 @@
<template>
<div>
<Button v-if="!singleThread" class="float-right" @click="openTopicModal()">
<Button
v-if="!singleThread && !readOnlyMode"
class="float-right"
@click="openTopicModal()"
>
{{ __('New {0}').format(singularize(title)) }}
</Button>
<div class="text-xl font-semibold text-ink-gray-9">
@@ -77,6 +81,7 @@ const currentTopic = ref(null)
const socket = inject('$socket')
const user = inject('$user')
const showTopicModal = ref(false)
const readOnlyMode = window.read_only_mode
const props = defineProps({
title: {

View File

@@ -97,7 +97,7 @@ const evaluators = createResource({
return {
doctype: 'Course Evaluator',
fields: ['evaluator', 'full_name', 'user_image', 'username'],
filters: search.value ? [['evaluator', 'like', search.value]] : [],
filters: search.value ? { evaluator: ['like', `%${search.value}%`] } : {},
}
},
auto: true,

View File

@@ -1,36 +1,18 @@
<template>
<svg
width="118"
height="118"
viewBox="0 0 118 118"
width="80"
height="79"
viewBox="0 0 80 79"
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)"
d="M57.1285 0.580383H22.8514C10.2309 0.580383 0 10.5649 0 22.8815V56.3332C0 68.6497 10.2309 78.6343 22.8514 78.6343H57.1285C69.749 78.6343 79.9799 68.6497 79.9799 56.3332V22.8815C79.9799 10.5649 69.749 0.580383 57.1285 0.580383Z"
fill="#0E7159"
/>
<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"
d="M62.8434 23.6906L60.7869 23.1052C53.6744 21.0702 45.9048 22.4641 39.992 26.8128C35.8502 23.7742 30.7943 22.1854 25.7099 22.2133H17.1406V27.8163H25.7099C29.6232 27.8163 33.508 29.015 36.6787 31.3845L39.992 33.8377L43.3056 31.3845C47.2475 28.4575 52.3032 27.2588 57.1306 28.0393V50.647C51.1035 49.9223 44.9051 51.4834 39.992 55.0795C35.8502 52.0688 30.8515 50.4798 25.7671 50.4798C24.7959 50.4798 23.8247 50.5355 22.8535 50.647V35.0642H17.1406V57.0588H62.8434V23.7185V23.6906Z"
fill="white"
/>
<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>

View File

@@ -0,0 +1,16 @@
<template>
<svg
width="20"
height="20"
viewBox="0 0 68 75"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M0 6.78182C0 1.60212 5.5742 -1.65958 10.09 0.879521L64.09 31.2545C68.6916 33.8443 68.6916 40.4693 64.09 43.0595L10.09 73.4345C5.5744 75.9736 0 72.7119 0 67.5322V6.78182ZM26.2695 38.5201C26.2695 37.3248 25.2265 37.9342 26.2695 38.5201C27.332 39.1178 27.332 37.9225 26.2695 38.5201Z"
fill="white"
/>
</svg>
</template>

View File

@@ -1,41 +1,52 @@
<template>
<div class="flex space-x-4 border rounded-md p-2">
<img :src="job.company_logo" class="size-10 rounded-full object-contain" />
<div class="flex flex-col space-y-2 flex-1">
<div class="flex items-center justify-between">
<span class="font-semibold text-ink-gray-9">
<div
class="flex flex-col border rounded-md p-3 h-full hover:border-outline-gray-4"
>
<div class="flex space-x-4 mb-4">
<div class="flex flex-col space-y-2 flex-1">
<div class="text-lg font-semibold text-ink-gray-9">
{{ job.company_name }}
</div>
<span class="font-medium text-ink-gray-7 leading-5">
{{ job.job_title }}
</span>
<div class="flex items-center space-x-1 text-sm text-ink-gray-7">
<MapPin class="size-3" />
<span>
{{ job.location }}{{ job.country ? `, ${job.country}` : '' }}
</span>
</div>
<div
v-if="job.applicants"
class="flex items-center space-x-1 text-sm text-ink-gray-7"
>
<User class="size-3" />
<span>
{{ job.applicants }}
{{ job.applicants > 1 ? __('applicants') : __('applicant') }}
</span>
</div>
</div>
<div class="flex items-center space-x-2 text-ink-gray-5">
<Building2 class="w-4 h-4 stroke-1.5" />
<span>
{{ job.company_name }}
</span>
</div>
<div class="flex items-center space-x-2 text-ink-gray-5">
<MapPin class="w-4 h-4 stroke-1.5" />
<span>
{{ job.location }}
</span>
</div>
<div class="flex items-center space-x-2 text-ink-gray-5">
<Shapes class="w-4 h-4 stroke-1.5" />
<span>
{{ job.type }}
</span>
</div>
<div class="flex items-center space-x-2 text-ink-gray-5">
<Calendar class="w-4 h-4 stroke-1.5" />
<span> {{ __('posted') }} {{ dayjs(job.creation).fromNow() }} </span>
</div>
<!-- <img :src="job.company_logo" alt="Company Logo" class="size-8 rounded-full object-contain bg-white" /> -->
</div>
<div class="space-x-2 mt-auto">
<Badge>
{{ job.type }}
</Badge>
<Badge>
{{ dayjs(job.creation).fromNow() }}
</Badge>
</div>
<!-- <div
class="description text-ink-gray-9 text-sm"
v-html="job.description"
></div> -->
</div>
</template>
<script setup>
import { Building2, Calendar, MapPin, Shapes } from 'lucide-vue-next'
import { inject } from 'vue'
import { Avatar } from 'frappe-ui'
import { Badge } from 'frappe-ui'
import { MapPin, User } from 'lucide-vue-next'
const dayjs = inject('$dayjs')
const props = defineProps({
@@ -45,3 +56,15 @@ const props = defineProps({
},
})
</script>
<style>
.description {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
width: 100%;
overflow: hidden;
margin-top: auto;
line-height: 1.5;
}
</style>

View File

@@ -3,7 +3,7 @@
<div class="text-lg font-semibold text-ink-gray-9">
{{ __('Live Class') }}
</div>
<Button v-if="user.data.is_moderator" @click="openLiveClassModal">
<Button v-if="canCreateClass()" @click="openLiveClassModal">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
@@ -87,6 +87,7 @@ import { formatTime } from '@/utils/'
const user = inject('$user')
const showLiveClassModal = ref(false)
const dayjs = inject('$dayjs')
const readOnlyMode = window.read_only_mode
const props = defineProps({
batch: {
@@ -116,6 +117,11 @@ const liveClasses = createListResource({
const openLiveClassModal = () => {
showLiveClassModal.value = true
}
const canCreateClass = () => {
if (readOnlyMode) return false
return user.data?.is_moderator || user.data?.is_evaluator
}
</script>
<style>
.short-introduction {

View File

@@ -118,6 +118,23 @@ import { ref, watch, reactive, inject } from 'vue'
import { RefreshCw, Plus, X } from 'lucide-vue-next'
import { useOnboarding } from 'frappe-ui/frappe'
interface User {
data: {
email: string
name: string
enabled: boolean
user_image: string
full_name: string
user_type: ['System User', 'Website User']
username: string
is_moderator: boolean
is_system_manager: boolean
is_evaluator: boolean
is_instructor: boolean
is_fc_site: boolean
}
}
const router = useRouter()
const show = defineModel('show')
const search = ref('')
@@ -126,6 +143,7 @@ const memberList = ref([])
const hasNextPage = ref(false)
const showForm = ref(false)
const dayjs = inject('$dayjs')
const user = inject<User | null>('$user')
const { updateOnboardingStep } = useOnboarding('learning')
const member = reactive({
@@ -187,7 +205,9 @@ const newMember = createResource({
auto: false,
onSuccess(data) {
show.value = false
updateOnboardingStep('invite_students')
if (user?.data?.is_system_manager) updateOnboardingStep('invite_students')
router.push({
name: 'Profile',
params: {

View File

@@ -0,0 +1,163 @@
<template>
<Dialog
v-model="show"
:options="{
size: 'lg',
}"
>
<template #body>
<div class="p-5 text-base max-h-[75vh] overflow-y-auto">
<div class="text-lg text-ink-gray-9 font-semibold mb-5">
{{
assignmentID === 'new'
? __('Create an Assignment')
: __('Edit Assignment')
}}
</div>
<div class="space-y-4">
<FormControl
v-model="assignment.title"
:label="__('Title')"
:required="true"
/>
<FormControl
v-model="assignment.type"
type="select"
:options="assignmentOptions"
:label="__('Submission Type')"
:required="true"
/>
<div>
<div class="text-xs text-ink-gray-5 mb-2">
{{ __('Question') }}
<span class="text-ink-red-3">*</span>
</div>
<TextEditor
:content="assignment.question"
@change="(val) => (assignment.question = val)"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
/>
</div>
</div>
<div class="flex justify-end space-x-2 mt-5">
<router-link
:to="{
name: 'AssignmentSubmissionList',
query: {
assignmentID: assignmentID,
},
}"
>
<Button v-if="assignmentID !== 'new'" variant="subtle">
{{ __('Check Submissions') }}
</Button>
</router-link>
<Button variant="solid" @click="saveAssignment">
{{ __('Save') }}
</Button>
</div>
</div>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { Button, Dialog, FormControl, TextEditor } from 'frappe-ui'
import { computed, reactive, watch } from 'vue'
import { showToast } from '@/utils'
const show = defineModel()
const assignments = defineModel<Assignments>('assignments')
interface Assignment {
title: string
type: string
question: string
}
interface Assignments {
data: Assignment[]
get: (params: { doctype: string; name: string }) => Promise<Assignment>
insert: {
submit: (params: Assignment, options: { onSuccess: () => void }) => void
}
}
const assignment = reactive({
title: '',
type: '',
question: '',
})
const props = defineProps({
assignmentID: {
type: String,
default: 'new',
},
})
watch(
() => props.assignmentID,
(val) => {
if (val !== 'new') {
assignments.value?.data.forEach((row) => {
if (row.name === val) {
assignment.title = row.title
assignment.type = row.type
assignment.question = row.question
}
})
}
},
{ flush: 'post' }
)
const saveAssignment = () => {
if (props.assignmentID == 'new') {
assignments.value.insert.submit(
{
...assignment,
},
{
onSuccess() {
show.value = false
showToast(
__('Success'),
__('Assignment created successfully'),
'check'
)
},
}
)
} else {
assignments.value.setValue.submit(
{
...assignment,
name: props.assignmentID,
},
{
onSuccess() {
show.value = false
showToast(
__('Success'),
__('Assignment updated successfully'),
'check'
)
},
}
)
}
}
const assignmentOptions = computed(() => {
return [
{ label: 'PDF', value: 'PDF' },
{ label: 'Image', value: 'Image' },
{ label: 'Document', value: 'Document' },
{ label: 'Text', value: 'Text' },
{ label: 'URL', value: 'URL' },
]
})
</script>

View File

@@ -32,7 +32,7 @@
</template>
<script setup>
import { Dialog, createResource } from 'frappe-ui'
import { ref } from 'vue'
import { ref, inject } from 'vue'
import Link from '@/components/Controls/Link.vue'
import { showToast } from '@/utils'
import { useOnboarding } from 'frappe-ui/frappe'
@@ -41,6 +41,7 @@ import { useSettings } from '@/stores/settings'
const show = defineModel()
const course = ref(null)
const evaluator = ref(null)
const user = inject('$user')
const courses = defineModel('courses')
const { updateOnboardingStep } = useOnboarding('learning')
const settingsStore = useSettings()
@@ -73,9 +74,11 @@ const addCourse = (close) => {
{},
{
onSuccess() {
courses.value.reload()
updateOnboardingStep('add_batch_course')
if (user.data?.is_system_manager)
updateOnboardingStep('add_batch_course')
close()
courses.value.reload()
course.value = null
evaluator.value = null
},

View File

@@ -38,7 +38,7 @@
<div class="mb-4">
<Button @click="openFileSelector" :loading="uploading">
{{
uploading ? `Uploading ${progress}%` : 'Upload an zip file'
uploading ? `Uploading ${progress}%` : 'Upload an ZIP file'
}}
</Button>
</div>
@@ -77,7 +77,7 @@ import {
FormControl,
Switch,
} from 'frappe-ui'
import { reactive, watch } from 'vue'
import { reactive, watch, inject } from 'vue'
import { showToast, getFileSize } from '@/utils/'
import { capture } from '@/telemetry'
import { FileText, X } from 'lucide-vue-next'
@@ -85,6 +85,7 @@ import { useOnboarding } from 'frappe-ui/frappe'
const show = defineModel()
const outline = defineModel('outline')
const user = inject('$user')
const { updateOnboardingStep } = useOnboarding('learning')
const props = defineProps({
@@ -139,8 +140,10 @@ const addChapter = async (close) => {
return validateChapter()
},
onSuccess: (data) => {
if (user.data?.is_system_manager)
updateOnboardingStep('create_first_chapter')
capture('chapter_created')
updateOnboardingStep('create_first_chapter')
chapterReference.submit(
{ name: data.name },
{

View File

@@ -1,38 +1,27 @@
<template>
<Dialog v-model="show" :options="dialogOptions">
<template #body-content>
<div class="space-y-4">
<Dialog
v-model="show"
:options="{
size: '3xl',
}"
>
<template #body>
<div class="p-5 space-y-5">
<div class="text-lg font-semibold text-ink-gray-9 mb-5">
{{ __(props.title) }}
</div>
<div
v-if="!editMode"
class="flex items-center text-xs text-ink-gray-7 space-x-5"
>
<div class="flex items-center space-x-2">
<input
type="radio"
id="existing"
value="existing"
v-model="questionType"
class="w-3 h-3 cursor-pointer"
/>
<label for="existing" class="cursor-pointer">
{{ __('Add an existing question') }}
</label>
</div>
<div class="flex items-center space-x-2">
<input
type="radio"
id="new"
value="new"
v-model="questionType"
class="w-3 h-3 cursor-pointer"
/>
<label for="new" class="cursor-pointer">
{{ __('Create a new question') }}
</label>
</div>
<Switch
size="sm"
:label="__('Choose an existing question')"
v-model="chooseFromExisting"
class="!p-0"
/>
</div>
<div v-if="questionType == 'new' || editMode" class="space-y-2">
<div v-if="!chooseFromExisting || editMode" class="space-y-2">
<div>
<label class="block text-xs text-ink-gray-5 mb-1">
{{ __('Question') }}
@@ -45,20 +34,34 @@
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
/>
</div>
<FormControl
v-model="question.marks"
:label="__('Marks')"
type="number"
/>
<FormControl
:label="__('Type')"
v-model="question.type"
type="select"
:options="['Choices', 'User Input', 'Open Ended']"
class="pb-2"
:required="true"
/>
<div v-if="question.type == 'Choices'" class="divide-y border-t">
<div class="grid grid-cols-2 gap-4">
<FormControl
v-model="question.marks"
:label="__('Marks')"
type="number"
/>
<FormControl
:label="__('Type')"
v-model="question.type"
type="select"
:options="['Choices', 'User Input', 'Open Ended']"
class="pb-2"
:required="true"
/>
</div>
<div
v-if="question.type == 'Choices'"
class="text-base font-semibold text-ink-gray-9 mb-5 mt-5"
>
{{ __('Options') }}
</div>
<div
v-else-if="question.type == 'User Input'"
class="text-base font-semibold text-ink-gray-9 mb-5 mt-5"
>
{{ __('Possibilities') }}
</div>
<div v-if="question.type == 'Choices'" class="grid grid-cols-2 gap-4">
<div v-for="n in 4" class="space-y-4 py-2">
<FormControl
:label="__('Option') + ' ' + n"
@@ -78,17 +81,18 @@
</div>
<div
v-else-if="question.type == 'User Input'"
v-for="n in 4"
class="space-y-2"
class="grid grid-cols-2 gap-4 py-2"
>
<FormControl
:label="__('Possibility') + ' ' + n"
v-model="question[`possibility_${n}`]"
:required="n == 1 ? true : false"
/>
<div v-for="n in 4">
<FormControl
:label="__('Possibility') + ' ' + n"
v-model="question[`possibility_${n}`]"
:required="n == 1 ? true : false"
/>
</div>
</div>
</div>
<div v-else-if="questionType == 'existing'" class="space-y-2">
<div v-else-if="chooseFromExisting" class="space-y-2">
<Link
v-model="existingQuestion.question"
:label="__('Select a question')"
@@ -100,26 +104,39 @@
type="number"
/>
</div>
<div class="flex items-center justify-end space-x-2 mt-5">
<Button variant="solid" @click="submitQuestion()">
{{ __('Submit') }}
</Button>
</div>
</div>
</template>
</Dialog>
</template>
<script setup>
import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
import { computed, watch, reactive, ref } from 'vue'
import {
Dialog,
FormControl,
TextEditor,
createResource,
Switch,
Button,
} from 'frappe-ui'
import { computed, watch, reactive, ref, inject } from 'vue'
import Link from '@/components/Controls/Link.vue'
import { showToast } from '@/utils'
import { useOnboarding } from 'frappe-ui/frappe'
const show = defineModel()
const quiz = defineModel('quiz')
const questionType = ref(null)
const chooseFromExisting = ref(false)
const editMode = ref(false)
const user = inject('$user')
const { updateOnboardingStep } = useOnboarding('learning')
const existingQuestion = reactive({
question: '',
marks: 0,
marks: 1,
})
const question = reactive({
question: '',
@@ -181,11 +198,12 @@ watch(show, () => {
editMode.value = false
if (props.questionDetail.question) questionData.fetch()
else {
;(question.question = ''), (question.marks = 0)
question.question = ''
question.marks = 1
question.type = 'Choices'
existingQuestion.question = ''
existingQuestion.marks = 0
questionType.value = null
existingQuestion.marks = 1
chooseFromExisting.value = false
populateFields()
}
@@ -220,32 +238,26 @@ const questionCreation = createResource({
},
})
const submitQuestion = (close) => {
if (props.questionDetail?.question) updateQuestion(close)
else addQuestion(close)
const submitQuestion = () => {
if (props.questionDetail?.question) updateQuestion()
else addQuestion()
}
const addQuestion = (close) => {
if (questionType.value == 'existing') {
addQuestionRow(
{
question: existingQuestion.question,
marks: existingQuestion.marks,
},
close
)
const addQuestion = () => {
if (chooseFromExisting.value) {
addQuestionRow({
question: existingQuestion.question,
marks: existingQuestion.marks,
})
} else {
questionCreation.submit(
{},
{
onSuccess(data) {
addQuestionRow(
{
question: data.name,
marks: question.marks,
},
close
)
addQuestionRow({
question: data.name,
marks: question.marks,
})
},
onError(err) {
showToast(__('Error'), __(err.messages?.[0] || err), 'x')
@@ -255,22 +267,24 @@ const addQuestion = (close) => {
}
}
const addQuestionRow = (question, close) => {
const addQuestionRow = (question) => {
questionRow.submit(
{
...question,
},
{
onSuccess() {
if (user.data?.is_system_manager)
updateOnboardingStep('create_first_quiz')
show.value = false
updateOnboardingStep('create_first_quiz')
showToast(__('Success'), __('Question added successfully'), 'check')
quiz.value.reload()
close()
show.value = false
},
onError(err) {
showToast(__('Error'), __(err.messages?.[0] || err), 'x')
close()
show.value = false
},
}
)
@@ -304,7 +318,7 @@ const marksUpdate = createResource({
},
})
const updateQuestion = (close) => {
const updateQuestion = () => {
questionUpdate.submit(
{},
{
@@ -320,7 +334,6 @@ const updateQuestion = (close) => {
'check'
)
quiz.value.reload()
close()
},
}
)
@@ -331,22 +344,6 @@ const updateQuestion = (close) => {
}
)
}
const dialogOptions = computed(() => {
return {
title: __(props.title),
size: 'xl',
actions: [
{
label: __('Submit'),
variant: 'solid',
onClick: (close) => {
submitQuestion(close)
},
},
],
}
})
</script>
<style>
input[type='radio']:checked {

View File

@@ -315,12 +315,6 @@ const tabsStructure = computed(() => {
doctype: 'Email Template',
type: 'Link',
},
{
label: 'Assignment Submission Template',
name: 'assignment_submission_template',
doctype: 'Email Template',
type: 'Link',
},
],
},
{
@@ -328,18 +322,52 @@ const tabsStructure = computed(() => {
icon: 'LogIn',
fields: [
{
label: 'Custom Content',
label: 'Identify User Category',
name: 'user_category',
type: 'checkbox',
description:
'Enable this option to identify the user category during signup.',
},
{
label: 'Disable signup',
name: 'disable_signup',
type: 'checkbox',
description:
'New users will have to be manually registered by Admins.',
},
{
label: 'Signup Consent HTML',
name: 'custom_signup_content',
type: 'Code',
mode: 'htmlmixed',
rows: 10,
},
],
},
{
label: 'SEO',
icon: 'Search',
fields: [
{
label: 'Ask for Occupation',
name: 'user_category',
type: 'checkbox',
label: 'Meta Description',
name: 'meta_description',
type: 'textarea',
rows: 4,
description:
'Enable this option to ask users to select their occupation during the signup process.',
"This description will be shown on lists and pages that don't have meta description",
},
{
label: 'Meta Keywords',
name: 'meta_keywords',
type: 'textarea',
rows: 4,
description:
'Keywords for search engines to find your website. Separated by commas.',
},
{
label: 'Meta Image',
name: 'meta_image',
type: 'Upload',
},
],
},

View File

@@ -26,13 +26,14 @@
</template>
<script setup>
import { Dialog, createResource } from 'frappe-ui'
import { ref } from 'vue'
import { ref, inject } from 'vue'
import Link from '@/components/Controls/Link.vue'
import { showToast } from '@/utils'
import { useOnboarding } from 'frappe-ui/frappe'
const students = defineModel('reloadStudents')
const student = ref()
const user = inject('$user')
const { updateOnboardingStep } = useOnboarding('learning')
const show = defineModel()
@@ -61,9 +62,11 @@ const addStudent = (close) => {
{},
{
onSuccess() {
if (user.data?.is_system_manager)
updateOnboardingStep('add_batch_student')
students.value.reload()
student.value = null
updateOnboardingStep('add_batch_student')
close()
},
onError(err) {

View File

@@ -1,159 +0,0 @@
<template>
<div v-if="showOnboardingBanner && onboardingDetails.data">
<Tooltip :text="__('Skip Onboarding')" placement="left">
<X
class="w-4 h-4 stroke-1 absolute top-2 right-2 cursor-pointer mr-1"
@click="skipOnboarding.reload()"
/>
</Tooltip>
<div class="flex items-center justify-evenly bg-surface-gray-2 p-10">
<div
@click="redirectToCourseForm()"
class="flex items-center space-x-2"
:class="{
'cursor-pointer': !onboardingDetails.data.course_created?.length,
}"
>
<span
v-if="onboardingDetails.data.course_created?.length"
class="py-1 px-1 bg-surface-white rounded-full"
>
<Check class="h-4 w-4 stroke-2 text-ink-green-3" />
</span>
<span
v-else
class="font-semibold bg-surface-white px-2 py-1 rounded-full"
>
1
</span>
<span class="text-lg font-semibold">
{{ __('Create a course') }}
</span>
</div>
<div
@click="redirectToChapterForm()"
class="flex items-center space-x-2"
:class="{
'cursor-pointer':
onboardingDetails.data.course_created?.length &&
!onboardingDetails.data.chapter_created?.length,
'text-ink-gray-3': !onboardingDetails.data.course_created?.length,
}"
>
<span
v-if="onboardingDetails.data.chapter_created?.length"
class="py-1 px-1 bg-surface-white rounded-full"
>
<Check class="h-4 w-4 stroke-2 text-ink-green-3" />
</span>
<span
v-else
class="font-semibold bg-surface-white px-2 py-1 rounded-full"
>
2
</span>
<span class="text-lg font-semibold">
{{ __('Add a chapter') }}
</span>
</div>
<div
@click="redirectToLessonForm()"
class="flex items-center space-x-2"
:class="{
'cursor-pointer':
onboardingDetails.data.course_created?.length &&
onboardingDetails.data.chapter_created?.length,
'text-ink-gray-3':
!onboardingDetails.data.course_created?.length ||
!onboardingDetails.data.chapter_created?.length,
}"
>
<span
v-if="onboardingDetails.data.lesson_created?.length"
class="py-1 px-1 bg-surface-white rounded-full"
>
<Check class="h-4 w-4 stroke-2 text-ink-green-3" />
</span>
<span class="font-semibold bg-surface-white px-2 py-1 rounded-full">
3
</span>
<span class="text-lg font-semibold">
{{ __('Add a lesson') }}
</span>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, watch } from 'vue'
import { Check, X } from 'lucide-vue-next'
import { useRouter } from 'vue-router'
import { useSettings } from '@/stores/settings'
import { createResource, Tooltip } from 'frappe-ui'
const showOnboardingBanner = ref(false)
const settings = useSettings()
const onboardingDetails = settings.onboardingDetails
const router = useRouter()
watch(onboardingDetails, () => {
if (!onboardingDetails.data?.is_onboarded) {
showOnboardingBanner.value = true
} else {
showOnboardingBanner.value = false
}
})
const redirectToCourseForm = () => {
if (onboardingDetails.data?.course_created.length) {
return
} else {
router.push({ name: 'CourseForm', params: { courseName: 'new' } })
}
}
const redirectToChapterForm = () => {
if (!onboardingDetails.data?.course_created.length) {
return
} else {
router.push({
name: 'CourseForm',
params: {
courseName: onboardingDetails.data?.first_course,
},
})
}
}
const redirectToLessonForm = () => {
if (!onboardingDetails.data?.course_created.length) {
return
} else if (!onboardingDetails.data?.chapter_created.length) {
return
} else {
router.push({
name: 'LessonForm',
params: {
courseName: onboardingDetails.data?.first_course,
chapterNumber: 1,
lessonNumber: 1,
},
})
}
}
const skipOnboarding = createResource({
url: 'frappe.client.set_value',
makeParams() {
return {
doctype: 'LMS Settings',
name: 'LMS Settings',
fieldname: 'is_onboarding_complete',
value: 1,
}
},
onSuccess(data) {
onboardingDetails.reload()
},
})
</script>

View File

@@ -1,7 +1,7 @@
<template>
<div v-if="quiz.data">
<div
class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-2"
class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-3"
>
<div class="leading-5">
{{
@@ -653,3 +653,8 @@ const getSubmissionColumns = () => {
]
}
</script>
<style>
p {
line-height: 1.5rem;
}
</style>

View File

@@ -51,7 +51,9 @@ const props = defineProps({
const update = () => {
props.fields.forEach((f) => {
if (f.type != 'Column Break') {
if (f.type == 'Upload') {
props.data.doc[f.name] = f.value ? f.value.file_url : null
} else if (f.type != 'Column Break') {
props.data.doc[f.name] = f.value
}
})

View File

@@ -54,21 +54,30 @@
<div v-else>
<div class="flex items-center text-sm space-x-2">
<div
class="flex items-center justify-center rounded border border-outline-gray-modals w-[10rem] py-5"
class="flex items-center justify-center rounded border border-outline-gray-modals bg-white w-[10rem] py-2"
>
<img :src="data[field.name]?.file_url" class="h-6 rounded" />
<img
:src="data[field.name]?.file_url || data[field.name]"
class="w-[80%] rounded"
/>
</div>
<div class="flex flex-col flex-wrap">
<span class="break-all text-ink-gray-9">
{{ data[field.name]?.file_name }}
{{
data[field.name]?.file_name ||
data[field.name].split('/').pop()
}}
</span>
<span class="text-sm text-ink-gray-5 mt-1">
<span
v-if="data[field.name]?.file_size"
class="text-sm text-ink-gray-5 mt-1"
>
{{ getFileSize(data[field.name]?.file_size) }}
</span>
</div>
<X
@click="data[field.name] = null"
class="bg-surface-gray-5 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
class="border text-ink-gray-7 border-outline-gray-3 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
/>
</div>
</div>

View File

@@ -36,7 +36,7 @@
<span v-else> Learning </span>
</div>
<div
v-if="userResource"
v-if="userResource.data"
class="mt-1 text-sm text-ink-gray-7 leading-none"
>
{{ convertToTitleCase(userResource.data?.full_name) }}
@@ -194,18 +194,6 @@ const userDropdownOptions = computed(() => {
)
},
},
],
},
{
group: '',
items: [
{
icon: Zap,
label: 'Powered by Learning',
onClick: () => {
window.open('https://frappe.io/learning', '_blank')
},
},
{
icon: LogOut,
label: 'Log out',

View File

@@ -1,32 +1,53 @@
<template>
<div ref="videoContainer" class="video-block group relative">
<div ref="videoContainer" class="video-block relative group">
<video
@timeupdate="updateTime"
@ended="videoEnded"
@click="togglePlay"
oncontextmenu="return false"
class="rounded-lg border border-gray-100 group cursor-pointer"
class="rounded-md border border-gray-100 cursor-pointer"
ref="videoRef"
>
<source :src="fileURL" :type="type" />
</video>
<div
class="flex items-center space-x-2 bg-surface-gray-3 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto invisible group-hover:visible"
v-if="!playing"
class="absolute inset-0 flex items-center justify-center cursor-pointer"
@click="playVideo"
>
<div
class="rounded-full p-4 pl-4.5"
style="
background: radial-gradient(
circle,
rgba(0, 0, 0, 0.3) 0%,
rgba(0, 0, 0, 0.4) 50%
);
"
>
<Play />
</div>
</div>
<div
class="flex items-center space-x-2 py-2 px-1 text-ink-white bg-gradient-to-b from-transparent to-black/75 absolute bottom-0 left-0 right-0 mx-auto rounded-md"
:class="{
'invisible group-hover:visible': playing,
}"
>
<Button variant="ghost">
<template #icon>
<Play
v-if="!playing"
@click="playVideo"
class="w-4 h-4 text-ink-gray-9"
class="size-4 text-ink-gray-9"
/>
<Pause v-else @click="pauseVideo" class="w-4 h-4 text-ink-gray-9" />
<Pause v-else @click="pauseVideo" class="size-5 text-ink-white" />
</template>
</Button>
<Button variant="ghost" @click="toggleMute">
<template #icon>
<Volume2 v-if="!muted" class="w-4 h-4 text-ink-gray-9" />
<VolumeX v-else class="w-4 h-4 text-ink-gray-9" />
<Volume2 v-if="!muted" class="size-5 text-ink-white" />
<VolumeX v-else class="size-5 text-ink-white" />
</template>
</Button>
<input
@@ -38,12 +59,12 @@
@input="changeCurrentTime"
class="duration-slider w-full h-1"
/>
<span class="text-xs font-medium">
<span class="text-sm font-semibold">
{{ formatTime(currentTime) }} / {{ formatTime(duration) }}
</span>
<Button variant="ghost" @click="toggleFullscreen">
<template #icon>
<Maximize class="w-4 h-4 text-ink-gray-9" />
<Maximize class="size-5 text-ink-white" />
</template>
</Button>
</div>
@@ -51,8 +72,9 @@
</template>
<script setup>
import { ref, onMounted, computed } from 'vue'
import { Play, Pause, Maximize, Volume2, VolumeX } from 'lucide-vue-next'
import { Pause, Maximize, Volume2, VolumeX } from 'lucide-vue-next'
import { Button } from 'frappe-ui'
import Play from '@/components/Icons/Play.vue'
const videoRef = ref(null)
const videoContainer = ref(null)
@@ -147,7 +169,6 @@ const toggleFullscreen = () => {
<style scoped>
.video-block {
width: 100%;
max-width: 900px;
margin: 0 auto;
}
@@ -165,15 +186,16 @@ iframe {
flex: 1;
-webkit-appearance: none;
appearance: none;
background-color: theme('colors.gray.400');
border-radius: 10px;
background-color: theme('colors.gray.100');
cursor: pointer;
}
.duration-slider::-webkit-slider-thumb {
height: 10px;
width: 10px;
width: 2px;
border-radius: 50%;
-webkit-appearance: none;
background-color: theme('colors.gray.900');
background-color: theme('colors.gray.500');
}
@media screen and (-webkit-min-device-pixel-ratio: 0) {
@@ -186,7 +208,7 @@ iframe {
input[type='range']::-webkit-slider-thumb {
-webkit-appearance: none;
cursor: pointer;
box-shadow: -500px 0 0 500px theme('colors.gray.900');
box-shadow: -500px 0 0 500px theme('colors.gray.600');
}
}
</style>

View File

@@ -26,5 +26,6 @@ app.mount('#app')
const { userResource, allUsers } = usersStore()
app.provide('$user', userResource)
app.provide('$allUsers', allUsers)
app.config.globalProperties.$user = userResource
app.config.globalProperties.$dialog = createDialog

View File

@@ -1,191 +0,0 @@
<template>
<header
class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs :items="breadcrumbs" />
<div class="space-x-2">
<router-link
v-if="assignment.doc?.name"
:to="{
name: 'AssignmentSubmissionList',
query: {
assignmentID: assignment.doc.name,
},
}"
>
<Button>
{{ __('Submission List') }}
</Button>
</router-link>
<Button variant="solid" @click="saveAssignment()">
{{ __('Save') }}
</Button>
</div>
</header>
<div class="w-3/4 mx-auto py-5">
<div class="font-semibold mb-4">
{{ __('Details') }}
</div>
<div class="grid grid-cols-2 gap-5 mt-4 mb-8">
<FormControl
v-model="model.title"
:label="__('Title')"
:required="true"
/>
<FormControl
v-model="model.type"
type="select"
:options="assignmentOptions"
:label="__('Type')"
:required="true"
/>
</div>
<div>
<div class="text-xs text-ink-gray-5 mb-2">
{{ __('Question') }}
<span class="text-ink-red-3">*</span>
</div>
<TextEditor
:content="model.question"
@change="(val) => (model.question = val)"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
/>
</div>
</div>
</template>
<script setup>
import {
Breadcrumbs,
Button,
createDocumentResource,
createResource,
FormControl,
TextEditor,
} from 'frappe-ui'
import {
computed,
inject,
onMounted,
onBeforeUnmount,
reactive,
watch,
} from 'vue'
import { showToast } from '@/utils'
import { useRouter } from 'vue-router'
const user = inject('$user')
const router = useRouter()
const props = defineProps({
assignmentID: {
type: String,
required: true,
},
})
const model = reactive({
title: '',
type: 'PDF',
question: '',
})
onMounted(() => {
if (
props.assignmentID == 'new' &&
!user.data?.is_moderator &&
!user.data?.is_instructor
) {
router.push({ name: 'Courses' })
}
if (props.assignmentID !== 'new') {
assignment.reload()
}
window.addEventListener('keydown', keyboardShortcut)
})
const keyboardShortcut = (e) => {
if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
saveAssignment()
e.preventDefault()
}
}
onBeforeUnmount(() => {
window.removeEventListener('keydown', keyboardShortcut)
})
const assignment = createDocumentResource({
doctype: 'LMS Assignment',
name: props.assignmentID,
auto: false,
})
const newAssignment = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'LMS Assignment',
...values,
},
}
},
onSuccess(data) {
router.push({ name: 'AssignmentForm', params: { assignmentID: data.name } })
},
onError(err) {
showToast(__('Error'), __(err.messages?.[0] || err), 'x')
},
})
const saveAssignment = () => {
if (props.assignmentID == 'new') {
newAssignment.submit({
...model,
})
} else {
assignment.setValue.submit(
{
...model,
},
{
onSuccess(data) {
showToast(__('Success'), __('Assignment saved successfully'), 'check')
assignment.reload()
},
onError(err) {
showToast(__('Error'), __(err.messages?.[0] || err), 'x')
},
}
)
}
}
watch(assignment, () => {
Object.keys(assignment.doc).forEach((key) => {
model[key] = assignment.doc[key]
})
})
const breadcrumbs = computed(() => [
{
label: __('Assignments'),
route: { name: 'Assignments' },
},
{
label: assignment.doc ? assignment.doc.title : __('New Assignment'),
},
])
const assignmentOptions = computed(() => {
return [
{ label: 'PDF', value: 'PDF' },
{ label: 'Image', value: 'Image' },
{ label: 'Document', value: 'Document' },
{ label: 'Text', value: 'Text' },
{ label: 'URL', value: 'URL' },
]
})
</script>

View File

@@ -14,12 +14,14 @@
</div>
</template>
<script setup>
import { Breadcrumbs, createResource } from 'frappe-ui'
import { computed, inject, onMounted, onBeforeUnmount, ref } from 'vue'
import { Breadcrumbs, createResource, usePageMeta } from 'frappe-ui'
import { computed, inject, onMounted, ref } from 'vue'
import { sessionStore } from '../stores/session'
import Assignment from '@/components/Assignment.vue'
const user = inject('$user')
const fromLesson = ref(false)
const { brand } = sessionStore()
const props = defineProps({
assignmentID: {
@@ -72,4 +74,11 @@ const breadcrumbs = computed(() => {
]
return crumbs
})
usePageMeta(() => {
return {
title: title.data?.title,
icon: brand.favicon,
}
})
</script>

View File

@@ -84,14 +84,17 @@ import {
ListRows,
ListRow,
ListRowItem,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, onMounted, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import { Pencil } from 'lucide-vue-next'
import { sessionStore } from '../stores/session'
import Link from '@/components/Controls/Link.vue'
const user = inject('$user')
const dayjs = inject('$dayjs')
const { brand } = sessionStore()
const router = useRouter()
const assignmentID = ref('')
const member = ref('')
@@ -214,4 +217,11 @@ const breadcrumbs = computed(() => {
},
]
})
usePageMeta(() => {
return {
title: __('Assignment Submissions'),
icon: brand.favicon,
}
})
</script>

View File

@@ -3,21 +3,21 @@
class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs :items="breadcrumbs" />
<router-link
:to="{
name: 'AssignmentForm',
params: {
assignmentID: 'new',
},
}"
<Button
v-if="!readOnlyMode"
variant="solid"
@click="
() => {
assignmentID = 'new'
showAssignmentForm = true
}
"
>
<Button variant="solid">
<template #prefix>
<Plus class="w-4 h-4" />
</template>
{{ __('New') }}
</Button>
</router-link>
<template #prefix>
<Plus class="w-4 h-4" />
</template>
{{ __('New') }}
</Button>
</header>
<div class="md:w-3/4 md:mx-auto py-5 mx-5">
@@ -38,12 +38,11 @@
:options="{
showTooltip: false,
selectable: false,
getRowRoute: (row) => ({
name: 'AssignmentForm',
params: {
assignmentID: row.name,
},
}),
onRowClick: (row) => {
if (readOnlyMode) return
assignmentID = row.name
showAssignmentForm = true
},
}"
>
</ListView>
@@ -72,6 +71,11 @@
</Button>
</div>
</div>
<AssignmentForm
v-model="showAssignmentForm"
v-model:assignments="assignments"
:assignmentID="assignmentID"
/>
</template>
<script setup>
import {
@@ -80,16 +84,23 @@ import {
createListResource,
FormControl,
ListView,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, onMounted, ref, watch } from 'vue'
import { Plus, Pencil } from 'lucide-vue-next'
import { useRouter } from 'vue-router'
import { sessionStore } from '../stores/session'
import AssignmentForm from '@/components/Modals/AssignmentForm.vue'
const user = inject('$user')
const dayjs = inject('$dayjs')
const titleFilter = ref('')
const typeFilter = ref('')
const showAssignmentForm = ref(false)
const assignmentID = ref('new')
const { brand } = sessionStore()
const router = useRouter()
const readOnlyMode = window.read_only_mode
onMounted(() => {
if (!user.data?.is_moderator && !user.data?.is_instructor) {
@@ -133,7 +144,7 @@ const assignmentFilter = computed(() => {
const assignments = createListResource({
doctype: 'LMS Assignment',
fields: ['name', 'title', 'type', 'creation'],
fields: ['name', 'title', 'type', 'creation', 'question'],
orderBy: 'modified desc',
cache: ['assignments'],
transform(data) {
@@ -163,7 +174,7 @@ const assignmentColumns = computed(() => {
label: __('Created'),
key: 'creation',
width: 1,
align: 'center',
align: 'right',
},
]
})
@@ -184,4 +195,11 @@ const breadcrumbs = computed(() => [
route: { name: 'Assignments' },
},
])
usePageMeta(() => {
return {
title: __('Assignments'),
icon: brand.favicon,
}
})
</script>

View File

@@ -24,10 +24,12 @@
</div>
</template>
<script setup>
import { createDocumentResource, createResource } from 'frappe-ui'
import { createResource, usePageMeta } from 'frappe-ui'
import { computed, inject } from 'vue'
import { sessionStore } from '../stores/session'
const dayjs = inject('$dayjs')
const { brand } = sessionStore()
const props = defineProps({
badgeName: {
@@ -70,4 +72,11 @@ const breadcrumbs = computed(() => {
},
]
})
usePageMeta(() => {
return {
title: badge.data.badge,
icon: brand.favicon,
}
})
</script>

View File

@@ -11,7 +11,7 @@
>
{{ __('Generate Certificates') }}
</Button>
<Button v-if="user.data?.is_moderator" @click="openAnnouncementModal()">
<Button v-if="canMakeAnnouncement()" @click="openAnnouncementModal()">
<span>
{{ __('Make an Announcement') }}
</span>
@@ -199,9 +199,14 @@
<script setup>
import { computed, inject, ref, onMounted, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { Breadcrumbs, Button, createResource, Tabs, Badge } from 'frappe-ui'
import CourseInstructors from '@/components/CourseInstructors.vue'
import UserAvatar from '@/components/UserAvatar.vue'
import {
Breadcrumbs,
Button,
createResource,
Tabs,
Badge,
usePageMeta,
} from 'frappe-ui'
import {
Clock,
LayoutDashboard,
@@ -214,7 +219,10 @@ import {
Globe,
ClipboardPen,
} from 'lucide-vue-next'
import { formatTime, updateDocumentTitle } from '@/utils'
import { formatTime } from '@/utils'
import { sessionStore } from '@/stores/session'
import CourseInstructors from '@/components/CourseInstructors.vue'
import UserAvatar from '@/components/UserAvatar.vue'
import BatchDashboard from '@/components/BatchDashboard.vue'
import BatchCourses from '@/components/BatchCourses.vue'
import LiveClass from '@/components/LiveClass.vue'
@@ -232,7 +240,9 @@ const showAnnouncementModal = ref(false)
const openCertificateDialog = ref(false)
const route = useRoute()
const router = useRouter()
const { brand } = sessionStore()
const tabIndex = ref(0)
const readOnlyMode = window.read_only_mode
const tabs = computed(() => {
let batchTabs = []
@@ -345,12 +355,15 @@ watch(tabIndex, () => {
}
})
const pageMeta = computed(() => {
const canMakeAnnouncement = () => {
if (readOnlyMode) return false
return user.data?.is_moderator || user.data?.is_evaluator
}
usePageMeta(() => {
return {
title: batch.data?.title,
description: batch.data?.description,
title: batch?.data?.title,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -14,13 +14,16 @@
{{ batch.data.description }}
</div>
<div
class="flex flex-col gap-2 lg:gap-0 lg:flex-row lg:items-center justify-between lg:w-1/2"
class="flex flex-col gap-2 lg:gap-0 lg:flex-row lg:items-center space-x-0 md:space-x-5 lg:w-1/2"
>
<div class="flex items-center text-ink-gray-7">
<BookOpen class="h-4 w-4 mr-2" />
<div
v-if="batch.data?.courses?.length"
class="flex items-center text-ink-gray-7"
>
<BookOpen class="h-4 w-4 mr-2 stroke-1.5" />
<span> {{ batch.data?.courses?.length }} {{ __('Courses') }} </span>
</div>
<span class="hidden lg:block" v-if="batch.data.courses"
<span v-if="batch.data?.courses?.length" class="hidden lg:block"
>&middot;</span
>
<DateRange
@@ -31,7 +34,7 @@
>&middot;</span
>
<div class="flex items-center text-ink-gray-7">
<Clock class="h-4 w-4 mr-2" />
<Clock class="h-4 w-4 mr-2 stroke-1.5" />
<span>
{{ formatTime(batch.data.start_time) }} -
{{ formatTime(batch.data.end_time) }}
@@ -102,8 +105,9 @@
import { computed, inject } from 'vue'
import { useRouter } from 'vue-router'
import { BookOpen, Clock } from 'lucide-vue-next'
import { formatTime, updateDocumentTitle } from '@/utils'
import { Breadcrumbs, createResource } from 'frappe-ui'
import { formatTime } from '@/utils'
import { Breadcrumbs, createResource, usePageMeta } from 'frappe-ui'
import { sessionStore } from '@/stores/session'
import CourseCard from '@/components/CourseCard.vue'
import BatchOverlay from '@/components/BatchOverlay.vue'
import DateRange from '../components/Common/DateRange.vue'
@@ -112,6 +116,7 @@ import UserAvatar from '@/components/UserAvatar.vue'
const user = inject('$user')
const router = useRouter()
const { brand } = sessionStore()
const props = defineProps({
batchName: {
@@ -152,14 +157,12 @@ const breadcrumbs = computed(() => {
return items
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: batch.data?.title,
description: batch.data?.description,
title: batch?.data?.title,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>
<style>
.batch-description p {

View File

@@ -8,98 +8,109 @@
{{ __('Save') }}
</Button>
</header>
<div class="w-1/2 mx-auto py-5">
<div class="w-3/4 mx-auto py-5">
<div class="">
<div class="text-lg font-semibold mb-4">
<div class="text-lg text-ink-gray-9 font-semibold mb-4">
{{ __('Details') }}
</div>
<div class="space-y-4 mb-4">
<FormControl
v-model="batch.title"
:label="__('Title')"
:required="true"
class="w-full"
/>
<div class="flex items-center space-x-5">
<div class="space-y-10 mb-4">
<div class="space-y-4">
<FormControl
v-model="batch.published"
type="checkbox"
:label="__('Published')"
v-model="batch.title"
:label="__('Title')"
:required="true"
class="w-full"
/>
<FormControl
v-model="batch.allow_self_enrollment"
type="checkbox"
:label="__('Allow self enrollment')"
/>
<FormControl
v-model="batch.certification"
type="checkbox"
:label="__('Certification')"
<MultiSelect
v-model="instructors"
doctype="User"
:label="__('Instructors')"
:required="true"
:filters="{ ignore_user_type: 1 }"
/>
</div>
</div>
</div>
<div class="mb-4">
<div class="text-xs text-ink-gray-5 mb-2">
{{ __('Meta Image') }}
</div>
<FileUploader
v-if="!batch.image"
:fileTypes="['image/*']"
:validateFile="validateFile"
@success="(file) => saveImage(file)"
>
<template v-slot="{ file, progress, uploading, openFileSelector }">
<div class="flex items-center">
<div class="border rounded-md w-fit py-5 px-20">
<Image class="size-5 stroke-1 text-ink-gray-7" />
<div class="grid grid-cols-2 gap-10">
<div class="flex flex-col space-y-5">
<FormControl
v-model="batch.published"
type="checkbox"
:label="__('Published')"
/>
<FormControl
v-model="batch.allow_self_enrollment"
type="checkbox"
:label="__('Allow self enrollment')"
/>
<FormControl
v-model="batch.certification"
type="checkbox"
:label="__('Certification')"
/>
</div>
<div>
<div class="text-xs text-ink-gray-5 mb-2">
{{ __('Meta Image') }}
</div>
<div class="ml-4">
<Button @click="openFileSelector">
{{ __('Upload') }}
</Button>
<div class="mt-2 text-ink-gray-5 text-sm">
{{
__(
'Appears when the batch URL is shared on any online platform'
)
}}
<FileUploader
v-if="!batch.image"
:fileTypes="['image/*']"
:validateFile="validateFile"
@success="(file) => saveImage(file)"
>
<template
v-slot="{ file, progress, uploading, openFileSelector }"
>
<div class="flex items-center">
<div class="border rounded-md w-fit py-5 px-20">
<Image class="size-5 stroke-1 text-ink-gray-7" />
</div>
<div class="ml-4">
<Button @click="openFileSelector">
{{ __('Upload') }}
</Button>
<div class="mt-2 text-ink-gray-5 text-sm">
{{
__(
'Appears when the batch URL is shared on any online platform'
)
}}
</div>
</div>
</div>
</template>
</FileUploader>
<div v-else class="mb-4">
<div class="flex items-center">
<img
:src="batch.image.file_url"
class="border rounded-md w-40"
/>
<div class="ml-4">
<Button @click="removeImage()">
{{ __('Remove') }}
</Button>
<div class="mt-2 text-ink-gray-5 text-sm">
{{
__(
'Appears when the batch URL is shared on any online platform'
)
}}
</div>
</div>
</div>
</div>
</div>
</template>
</FileUploader>
<div v-else class="mb-4">
<div class="flex items-center">
<img :src="batch.image.file_url" class="border rounded-md w-40" />
<div class="ml-4">
<Button @click="removeImage()">
{{ __('Remove') }}
</Button>
<div class="mt-2 text-ink-gray-5 text-sm">
{{
__(
'Appears when the batch URL is shared on any online platform'
)
}}
</div>
</div>
</div>
</div>
</div>
<MultiSelect
v-model="instructors"
doctype="User"
:label="__('Instructors')"
:required="true"
:filters="{ ignore_user_type: 1 }"
/>
<div class="my-10">
<div class="text-lg font-semibold mb-4">
<div class="text-lg text-ink-gray-9 font-semibold mb-4">
{{ __('Date and Time') }}
</div>
<div class="grid grid-cols-2 gap-10">
<div class="grid grid-cols-3 gap-10">
<div>
<FormControl
v-model="batch.start_date"
@@ -115,14 +126,6 @@
class="mb-4"
:required="true"
/>
<FormControl
v-model="batch.timezone"
:label="__('Timezone')"
type="text"
:placeholder="__('Example: IST (+5:30)')"
class="mb-4"
:required="true"
/>
</div>
<div>
<FormControl
@@ -140,14 +143,24 @@
:required="true"
/>
</div>
<div>
<FormControl
v-model="batch.timezone"
:label="__('Timezone')"
type="text"
:placeholder="__('Example: IST (+5:30)')"
class="mb-4"
:required="true"
/>
</div>
</div>
</div>
<div class="mb-10">
<div class="text-lg font-semibold mb-4">
<div class="text-lg text-ink-gray-9 font-semibold mb-4">
{{ __('Settings') }}
</div>
<div class="grid grid-cols-2 gap-10">
<div class="grid grid-cols-3 gap-10">
<div>
<FormControl
v-model="batch.seat_count"
@@ -162,11 +175,6 @@
type="date"
class="mb-4"
/>
<Link
doctype="Email Template"
:label="__('Email Template')"
v-model="batch.confirmation_email_template"
/>
</div>
<div>
<FormControl
@@ -191,24 +199,30 @@
v-model="batch.category"
/>
</div>
<div>
<Link
doctype="Email Template"
:label="__('Email Template')"
v-model="batch.confirmation_email_template"
/>
</div>
</div>
</div>
<div class="">
<div class="text-lg font-semibold mb-4">
<div class="text-lg text-ink-gray-9 font-semibold mb-4">
{{ __('Payment') }}
</div>
<div>
<FormControl
v-model="batch.paid_batch"
type="checkbox"
:label="__('Paid Batch')"
/>
<FormControl
v-model="batch.paid_batch"
type="checkbox"
:label="__('Paid Batch')"
/>
<div class="grid grid-cols-3 gap-10 mt-4">
<FormControl
v-model="batch.amount"
:label="__('Amount')"
type="number"
class="my-4"
/>
<Link
doctype="Currency"
@@ -220,7 +234,7 @@
</div>
<div class="my-10">
<div class="text-lg font-semibold mb-4">
<div class="text-lg text-ink-gray-9 font-semibold mb-4">
{{ __('Description') }}
</div>
<FormControl
@@ -264,17 +278,20 @@ import {
Button,
TextEditor,
createResource,
usePageMeta,
} from 'frappe-ui'
import Link from '@/components/Controls/Link.vue'
import { useRouter } from 'vue-router'
import { showToast } from '@/utils'
import { Image } from 'lucide-vue-next'
import { capture } from '@/telemetry'
import MultiSelect from '@/components/Controls/MultiSelect.vue'
import { useOnboarding } from 'frappe-ui/frappe'
import { sessionStore } from '../stores/session'
import MultiSelect from '@/components/Controls/MultiSelect.vue'
import Link from '@/components/Controls/Link.vue'
const router = useRouter()
const user = inject('$user')
const { brand } = sessionStore()
const { updateOnboardingStep } = useOnboarding('learning')
const props = defineProps({
@@ -427,10 +444,13 @@ const createNewBatch = () => {
{},
{
onSuccess(data) {
if (user.data?.is_system_manager) {
updateOnboardingStep('create_first_batch', true, false, () => {
localStorage.setItem('firstBatch', data.name)
})
}
capture('batch_created')
updateOnboardingStep('create_first_batch', true, false, () => {
localStorage.setItem('firstBatch', data.name)
})
router.push({
name: 'BatchDetail',
params: {
@@ -439,7 +459,7 @@ const createNewBatch = () => {
})
},
onError(err) {
showToast('Error', err.messages?.[0] || err, 'x')
showToast('Message', err.messages?.[0] || err, 'alert-circle')
},
}
)
@@ -458,7 +478,7 @@ const editBatchDetails = () => {
})
},
onError(err) {
showToast('Error', err.messages?.[0] || err, 'x')
showToast('Message', err.messages?.[0] || err, 'alert-circle')
},
}
)
@@ -505,4 +525,11 @@ const breadcrumbs = computed(() => {
})
return crumbs
})
usePageMeta(() => {
return {
title: props.batchName == 'new' ? 'New Batch' : batchDetail.data?.title,
icon: brand.favicon,
}
})
</script>

View File

@@ -4,7 +4,7 @@
>
<Breadcrumbs :items="breadcrumbs" />
<router-link
v-if="user.data?.is_moderator"
v-if="canCreateBatch()"
:to="{
name: 'BatchForm',
params: { batchName: 'new' },
@@ -104,14 +104,16 @@ import {
FormControl,
Select,
TabButtons,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, onMounted, ref, watch } from 'vue'
import { BookOpen, Plus } from 'lucide-vue-next'
import { updateDocumentTitle } from '@/utils'
import { sessionStore } from '@/stores/session'
import BatchCard from '@/components/BatchCard.vue'
const user = inject('$user')
const dayjs = inject('$dayjs')
const { brand } = sessionStore()
const start = ref(0)
const pageLength = ref(20)
const categories = ref([])
@@ -122,6 +124,7 @@ const filters = ref({})
const is_student = computed(() => user.data?.is_student)
const currentTab = ref(is_student.value ? 'All' : 'Upcoming')
const orderBy = ref('start_date')
const readOnlyMode = window.read_only_mode
onMounted(() => {
setFiltersFromQuery()
@@ -297,6 +300,12 @@ const batchTabs = computed(() => {
return tabs
})
const canCreateBatch = () => {
if (readOnlyMode) return false
if (user.data?.is_moderator || user.data?.is_instructor) return true
return false
}
const breadcrumbs = computed(() => [
{
label: __('Batches'),
@@ -304,12 +313,10 @@ const breadcrumbs = computed(() => [
},
])
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: 'Batches',
description: 'All upcoming batches.',
title: __('Batches'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -151,19 +151,20 @@
</template>
<script setup>
import {
Input,
Button,
createResource,
FormControl,
Breadcrumbs,
Tooltip,
usePageMeta,
} from 'frappe-ui'
import { reactive, inject, onMounted, computed } from 'vue'
import { showToast } from '@/utils/'
import { sessionStore } from '../stores/session'
import Link from '@/components/Controls/Link.vue'
import NotPermitted from '@/components/NotPermitted.vue'
import { showToast } from '@/utils/'
const user = inject('$user')
const { brand } = sessionStore()
onMounted(() => {
const script = document.createElement('script')
@@ -356,4 +357,11 @@ const redirectTo = computed(() => {
return `/lms/courses/${props.name}/certification`
}
})
usePageMeta(() => {
return {
title: __('Billing Details'),
icon: brand.favicon,
}
})
</script>

View File

@@ -12,12 +12,13 @@
</Button>
</router-link>
</header>
<div class="p-5 lg:w-3/4 mx-auto">
<div
class="flex flex-col lg:flex-row lg:items-center space-y-4 lg:space-y-0 justify-between mb-5"
>
<div class="text-lg text-ink-gray-9 font-semibold">
{{ __('All Certified Participants') }}
<div
v-if="participants.data?.length"
class="mx-auto w-full max-w-4xl pt-6 pb-10"
>
<div class="flex flex-col md:flex-row justify-between mb-4 px-3">
<div class="text-xl font-semibold text-ink-gray-7 mb-4 md:mb-0">
{{ memberCount }} {{ __('certified members') }}
</div>
<div class="grid grid-cols-2 gap-2">
<FormControl
@@ -40,57 +41,80 @@
</div>
</div>
</div>
<div v-if="participants.data?.length">
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-5">
<div class="divide-y">
<template v-for="participant in participants.data">
<router-link
v-for="participant in participants.data"
:to="{
name: 'ProfileCertificates',
params: { username: participant.username },
params: {
username: participant.username,
},
}"
class="flex sm:rounded px-3 py-2 sm:h-15 hover:bg-surface-gray-2"
>
<div
class="flex items-center space-x-2 border rounded-md hover:bg-surface-menu-bar p-2 text-ink-gray-7"
>
<div class="flex items-center w-full space-x-3">
<Avatar
:image="participant.user_image"
class="size-8 rounded-full object-contain"
:label="participant.full_name"
size="2xl"
/>
<div class="flex flex-col space-y-2">
<div class="font-medium">
{{ participant.full_name }}
<div class="flex flex-col md:flex-row w-full">
<div class="flex-1">
<div class="text-base font-medium text-ink-gray-8">
{{ participant.full_name }}
</div>
<div
v-if="participant.headline"
class="mt-1.5 text-base text-ink-gray-5"
>
{{ participant.headline }}
</div>
</div>
<div
v-if="participant.headline"
class="headline text-sm text-ink-gray-7"
class="flex items-center space-x-3 md:space-x-24 text-sm md:text-base mt-1.5"
>
{{ participant.headline }}
<div class="text-ink-gray-5">
{{ participant.certificate_count }}
{{
participant.certificate_count > 1
? __('certificates')
: __('certificate')
}}
</div>
<span class="text-ink-gray-4 md:hidden">·</span>
<div class="text-ink-gray-5">
{{ dayjs(participant.issue_date).format('DD MMM YYYY') }}
</div>
</div>
</div>
</div>
</router-link>
</div>
<div
v-if="!participants.list.loading && participants.hasNextPage"
class="flex justify-center mt-5"
>
<Button @click="participants.next()">
{{ __('Load More') }}
</Button>
</div>
</template>
</div>
<div
v-else-if="!participants.list.loading"
class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
v-if="!participants.list.loading && participants.hasNextPage"
class="flex justify-center mt-5"
>
<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
<div class="text-lg font-medium mb-1">
{{ __('No participants found') }}
</div>
<div class="leading-5 w-2/5 text-center">
{{ __('There are no participants matching this criteria.') }}
</div>
<Button @click="participants.next()">
{{ __('Load More') }}
</Button>
</div>
</div>
<div
v-else
class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-48"
>
<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
<div class="text-lg font-medium mb-1">
{{ __('No certified members') }}
</div>
<div class="leading-5 w-2/5 text-center">
{{
__(
'No certified members found. Please check again later or get certified yourself.'
)
}}
</div>
</div>
</template>
@@ -99,17 +123,22 @@ import {
Avatar,
Breadcrumbs,
Button,
call,
createListResource,
FormControl,
Select,
usePageMeta,
} from 'frappe-ui'
import { computed, onMounted, ref } from 'vue'
import { updateDocumentTitle } from '@/utils'
import { computed, inject, onMounted, ref } from 'vue'
import { BookOpen, GraduationCap } from 'lucide-vue-next'
import { sessionStore } from '../stores/session'
const currentCategory = ref('')
const filters = ref({})
const nameFilter = ref('')
const { brand } = sessionStore()
const memberCount = ref(0)
const dayjs = inject('$dayjs')
onMounted(() => {
updateParticipants()
@@ -123,6 +152,12 @@ const participants = createListResource({
pageLength: 30,
})
const count = call('lms.lms.api.get_count_of_certified_members').then(
(data) => {
memberCount.value = data
}
)
const categories = createListResource({
doctype: 'LMS Certificate',
url: 'lms.lms.api.get_certification_categories',
@@ -158,18 +193,17 @@ const updateFilters = () => {
const breadcrumbs = computed(() => [
{
label: __('Certified Participants'),
label: __('Certified Members'),
route: { name: 'CertifiedParticipants' },
},
])
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: 'Certified Participants',
description: 'All participants that have been certified.',
title: __('Certified Members'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>
<style>
.headline {

View File

@@ -36,12 +36,14 @@
</template>
<script setup>
import { computed, inject, onMounted, ref } from 'vue'
import { Breadcrumbs, call, createResource } from 'frappe-ui'
import { Breadcrumbs, call, createResource, usePageMeta } from 'frappe-ui'
import { useRouter } from 'vue-router'
import { sessionStore } from '../stores/session'
import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'
const courseTitle = ref(null)
const evaluator = ref(null)
const { brand } = sessionStore()
const courses = ref([])
const user = inject('$user')
const dayjs = inject('$dayjs')
@@ -133,4 +135,11 @@ const breadcrumbs = computed(() => [
label: __('Certification'),
},
])
usePageMeta(() => {
return {
title: courseTitle.value,
icon: brand.favicon,
}
})
</script>

View File

@@ -56,7 +56,7 @@
<CourseInstructors :instructors="course.data.instructors" />
</div>
</div>
<div v-if="course.data.tags" class="flex mt-4 w-fit">
<div v-if="course.data.tags" class="flex my-4 w-fit">
<Badge
theme="gray"
size="lg"
@@ -69,7 +69,7 @@
<CourseCardOverlay :course="course" class="md:hidden mb-4" />
<div
v-html="course.data.description"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-4"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-10"
></div>
<div class="mt-10">
<CourseOutline
@@ -92,16 +92,24 @@
</div>
</template>
<script setup>
import { createResource, Breadcrumbs, Badge, Tooltip } from 'frappe-ui'
import {
createResource,
Breadcrumbs,
Badge,
Tooltip,
usePageMeta,
} from 'frappe-ui'
import { computed } from 'vue'
import { Users, Star } from 'lucide-vue-next'
import { sessionStore } from '@/stores/session'
import CourseCardOverlay from '@/components/CourseCardOverlay.vue'
import CourseOutline from '@/components/CourseOutline.vue'
import CourseReviews from '@/components/CourseReviews.vue'
import UserAvatar from '@/components/UserAvatar.vue'
import { updateDocumentTitle } from '@/utils'
import CourseInstructors from '@/components/CourseInstructors.vue'
const { brand } = sessionStore()
const props = defineProps({
courseName: {
type: String,
@@ -127,14 +135,12 @@ const breadcrumbs = computed(() => {
return items
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: course?.data?.title,
description: course?.data?.short_introduction,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>
<style>
.avatar-group {

View File

@@ -3,15 +3,11 @@
<div class="grid md:grid-cols-[70%,30%] h-full">
<div>
<header
class="sticky top-0 z-10 group flex flex-col md:flex-row md:items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs class="h-7" :items="breadcrumbs" />
<div class="flex items-center mt-3 md:mt-0">
<Button
v-if="courseResource.data?.name"
@click="trashCourse()"
class="invisible group-hover:visible"
>
<Button v-if="courseResource.data?.name" @click="trashCourse()">
<template #icon>
<Trash2 class="w-4 h-4 stroke-1.5" />
</template>
@@ -253,6 +249,7 @@ import {
createResource,
FormControl,
FileUploader,
usePageMeta,
} from 'frappe-ui'
import {
inject,
@@ -264,18 +261,20 @@ import {
watch,
getCurrentInstance,
} from 'vue'
import { showToast, updateDocumentTitle } from '@/utils'
import Link from '@/components/Controls/Link.vue'
import { showToast } from '@/utils'
import { Image, Trash2, X } from 'lucide-vue-next'
import { useRouter } from 'vue-router'
import CourseOutline from '@/components/CourseOutline.vue'
import MultiSelect from '@/components/Controls/MultiSelect.vue'
import { capture } from '@/telemetry'
import { useOnboarding } from 'frappe-ui/frappe'
import { sessionStore } from '../stores/session'
import { useSettings } from '@/stores/settings'
import Link from '@/components/Controls/Link.vue'
import CourseOutline from '@/components/CourseOutline.vue'
import MultiSelect from '@/components/Controls/MultiSelect.vue'
const user = inject('$user')
const newTag = ref('')
const { brand } = sessionStore()
const router = useRouter()
const instructors = ref([])
const settingsStore = useSettings()
@@ -311,11 +310,7 @@ const course = reactive({
})
onMounted(() => {
if (
props.courseName == 'new' &&
!user.data?.is_moderator &&
!user.data?.is_instructor
) {
if (!user.data?.is_moderator && !user.data?.is_instructor) {
router.push({ name: 'Courses' })
}
@@ -401,7 +396,7 @@ const courseResource = createResource({
'paid_course',
'featured',
'enable_certification',
'paid_certifiate',
'paid_certificate',
]
for (let idx in checkboxes) {
let key = checkboxes[idx]
@@ -444,11 +439,14 @@ const submitCourse = () => {
} else {
courseCreationResource.submit(course, {
onSuccess(data) {
if (user.data?.is_system_manager) {
updateOnboardingStep('create_first_course', true, false, () => {
localStorage.setItem('firstCourse', data.name)
})
}
capture('course_created')
showToast('Success', 'Course created successfully', 'check')
updateOnboardingStep('create_first_course', true, false, () => {
localStorage.setItem('firstCourse', data.name)
})
router.push({
name: 'CourseForm',
params: { courseName: data.name },
@@ -574,12 +572,10 @@ const breadcrumbs = computed(() => {
return crumbs
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: 'Create a Course',
description: 'Create or edit a course for your learning system.',
title: courseResource.data?.title || __('New Course'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -4,7 +4,7 @@
>
<Breadcrumbs :items="breadcrumbs" />
<router-link
v-if="user.data?.is_moderator"
v-if="canCreateCourse()"
:to="{
name: 'CourseForm',
params: { courseName: 'new' },
@@ -57,7 +57,7 @@
</div>
<div
v-if="courses.data?.length"
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-5"
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-4"
>
<router-link
v-for="course in courses.data"
@@ -96,15 +96,19 @@
import {
Breadcrumbs,
Button,
call,
createListResource,
FormControl,
Select,
TabButtons,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, onMounted, ref, watch } from 'vue'
import { BookOpen, Plus } from 'lucide-vue-next'
import { updateDocumentTitle } from '@/utils'
import { sessionStore } from '@/stores/session'
import { canCreateCourse } from '@/utils'
import CourseCard from '@/components/CourseCard.vue'
import router from '../router'
const user = inject('$user')
const dayjs = inject('$dayjs')
@@ -116,8 +120,11 @@ const title = ref('')
const certification = ref(false)
const filters = ref({})
const currentTab = ref('Live')
const { brand } = sessionStore()
const readOnlyMode = window.read_only_mode
onMounted(() => {
identifyUserPersona()
setFiltersFromQuery()
updateCourses()
categories.value = [
@@ -142,16 +149,45 @@ const courses = createListResource({
pageLength: pageLength.value,
start: start.value,
onSuccess(data) {
let allCategories = data.map((course) => course.category)
allCategories = allCategories.filter(
(category, index) => allCategories.indexOf(category) === index && category
)
if (categories.value.length <= allCategories.length) {
updateCategories(data)
}
setCategories(data)
},
})
const setCategories = (data) => {
let allCategories = data.map((course) => course.category)
allCategories = allCategories.filter(
(category, index) => allCategories.indexOf(category) === index && category
)
if (categories.value.length <= allCategories.length) {
updateCategories(data)
}
}
const isPersonaCaptured = async () => {
let persona = await call('frappe.client.get_single_value', {
doctype: 'LMS Settings',
field: 'persona_captured',
})
return persona
}
const identifyUserPersona = async () => {
if (user.data?.is_system_manager && !user.data?.developer_mode) {
let personaCaptured = await isPersonaCaptured()
if (personaCaptured) return
call('frappe.client.get_count', {
doctype: 'LMS Course',
}).then((data) => {
if (!data) {
router.push({
name: 'PersonaForm',
})
}
})
}
}
const updateCourses = () => {
updateFilters()
courses.update({
@@ -303,12 +339,10 @@ const breadcrumbs = computed(() => [
},
])
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: 'Courses',
description: 'All published courses.',
title: __('Courses'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -1,39 +0,0 @@
<template>
<div class="max-w-3xl py-12 mx-auto">
<Button
icon-left="code"
@click="$resources.ping.fetch"
:loading="$resources.ping.loading"
>
Click to send 'ping' request
</Button>
<div>
{{ $resources.ping.data }}
</div>
<pre>{{ $resources.ping }}</pre>
<Button @click="showDialog = true">Open Dialog</Button>
<Dialog title="Title" v-model="showDialog"> Dialog content </Dialog>
</div>
</template>
<script>
import { Dialog } from 'frappe-ui'
export default {
name: 'Home',
data() {
return {
showDialog: false,
}
},
resources: {
ping: {
url: 'ping',
},
},
components: {
Dialog,
},
}
</script>

View File

@@ -16,21 +16,30 @@
},
]"
/>
<div v-if="user.data?.name" class="flex">
<div
v-if="user.data?.name && !readOnlyMode"
class="flex items-center space-x-2"
>
<router-link
v-if="user.data.name == job.data?.owner"
:to="{
name: 'JobCreation',
name: 'JobForm',
params: { jobName: job.data?.name },
}"
>
<Button class="mr-2">
<Button>
<template #prefix>
<Pencil class="h-4 w-4 stroke-1.5" />
</template>
{{ __('Edit') }}
</Button>
</router-link>
<Button @click="redirectToWebsite(job.data?.company_website)">
<template #prefix>
<SquareArrowOutUpRight class="h-4 w-4 stroke-1.5" />
</template>
{{ __('Visit Website') }}
</Button>
<Button
v-if="!jobApplication.data?.length"
variant="solid"
@@ -41,8 +50,14 @@
</template>
{{ __('Apply') }}
</Button>
<Badge v-else variant="subtle" theme="green" size="lg">
<template #prefix>
<Check class="h-4 w-4" />
</template>
{{ __('You have applied') }}
</Badge>
</div>
<div v-else>
<div v-else-if="!readOnlyMode">
<Button @click="redirectToLogin(job.data?.name)">
<span>
{{ __('Login to apply') }}
@@ -50,16 +65,17 @@
</Button>
</div>
</header>
<div v-if="job.data" class="max-w-3xl mx-auto">
<div v-if="job.data" class="max-w-3xl mx-auto pt-5">
<div class="p-4">
<div class="space-y-5 mb-10">
<div class="flex items-center">
<img
:src="job.data.company_logo"
class="w-16 h-16 rounded-lg object-contain mr-4"
class="size-10 rounded-lg object-contain cursor-pointer mr-4"
:alt="job.data.company_name"
@click="redirectToWebsite(job.data.company_website)"
/>
<div class="text-2xl text-ink-gray-9 font-semibold mb-4">
<div class="text-2xl text-ink-gray-9 font-semibold">
{{ job.data.job_title }}
</div>
</div>
@@ -68,8 +84,8 @@
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-5 md:gap-y-5"
>
<div class="flex items-center space-x-4">
<Building2 class="h-4 w-4 text-ink-green-2" />
<div class="flex flex-col space-y-2 text-ink-gray-7">
<Building2 class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Organisation') }}
</span>
@@ -79,20 +95,20 @@
</div>
</div>
<div class="flex items-center space-x-4">
<MapPin class="size-4 text-ink-red-3" />
<div class="flex flex-col space-y-2 text-ink-gray-7">
<span class="text-xs font-medium uppercase">
<MapPin class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Location') }}
</span>
<span class="text-sm font-semibold">
{{ job.data.location }}
{{ job.data.location }}, {{ job.data.country }}
</span>
</div>
</div>
<div class="flex items-center space-x-4">
<ClipboardType class="h-4 w-4 text-yellow-500" />
<div class="flex flex-col space-y-2 text-ink-gray-7">
<span class="text-xs font-medium uppercase">
<ClipboardType class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Category') }}
</span>
<span class="text-sm font-semibold">
@@ -101,9 +117,9 @@
</div>
</div>
<div class="flex items-center space-x-4">
<CalendarDays class="h-4 w-4 text-ink-blue-2" />
<div class="flex flex-col space-y-2 text-ink-gray-7">
<span class="text-xs font-medium uppercase">
<CalendarDays class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Posted on') }}
</span>
<span class="text-sm font-semibold">
@@ -115,9 +131,9 @@
v-if="applicationCount.data"
class="flex items-center space-x-4"
>
<SquareUserRound class="h-4 w-4 text-purple-500" />
<div class="flex flex-col space-y-2 text-ink-gray-7">
<span class="text-xs font-medium uppercase">
<SquareUserRound class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Applications Received') }}
</span>
<span class="text-sm font-semibold">
@@ -142,23 +158,33 @@
</div>
</template>
<script setup>
import { Button, Breadcrumbs, createResource } from 'frappe-ui'
import { inject, ref, computed } from 'vue'
import { updateDocumentTitle } from '@/utils'
import {
Badge,
Button,
Breadcrumbs,
createResource,
usePageMeta,
} from 'frappe-ui'
import { inject, ref } from 'vue'
import { sessionStore } from '../stores/session'
import JobApplicationModal from '@/components/Modals/JobApplicationModal.vue'
import {
MapPin,
Check,
SendHorizonal,
Pencil,
Building2,
CalendarDays,
ClipboardType,
SquareUserRound,
SquareArrowOutUpRight,
} from 'lucide-vue-next'
const user = inject('$user')
const dayjs = inject('$dayjs')
const { brand } = sessionStore()
const showApplicationModal = ref(false)
const readOnlyMode = window.read_only_mode
const props = defineProps({
job: {
@@ -215,12 +241,14 @@ const redirectToLogin = (job) => {
window.location.href = `/login?redirect-to=/job-openings/${job}`
}
const pageMeta = computed(() => {
const redirectToWebsite = (url) => {
window.open(url, '_blank')
}
usePageMeta(() => {
return {
title: job.data?.job_title,
description: job.data?.description,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -13,17 +13,22 @@
<div class="text-lg font-semibold mb-4">
{{ __('Job Details') }}
</div>
<div class="grid grid-cols-2 gap-4">
<div>
<div class="grid grid-cols-2 gap-5">
<div class="space-y-4">
<FormControl
v-model="job.job_title"
:label="__('Title')"
class="mb-4"
:required="true"
/>
<FormControl
v-model="job.location"
:label="__('Location')"
:label="__('City')"
:required="true"
/>
<Link
v-model="job.country"
doctype="Country"
:label="__('Country')"
:required="true"
/>
</div>
@@ -45,25 +50,12 @@
/>
</div>
</div>
<div class="mt-4">
<label class="block text-ink-gray-5 text-xs mb-1">
{{ __('Description') }}
<span class="text-ink-red-3">*</span>
</label>
<TextEditor
:content="job.description"
@change="(val) => (job.description = val)"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] mb-4"
/>
</div>
</div>
<div class="container mb-4 pb-4">
<div class="container border-b mb-4 pb-4">
<div class="text-lg font-semibold mb-4">
{{ __('Company Details') }}
</div>
<div class="grid grid-cols-2 gap-4">
<div class="grid grid-cols-2 gap-5">
<div>
<FormControl
v-model="job.company_name"
@@ -128,6 +120,19 @@
</div>
</div>
</div>
<div class="container mt-4">
<label class="block text-ink-gray-5 text-xs mb-1">
{{ __('Description') }}
<span class="text-ink-red-3">*</span>
</label>
<TextEditor
:content="job.description"
@change="(val) => (job.description = val)"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] mb-4"
/>
</div>
</div>
</div>
</template>
@@ -139,14 +144,17 @@ import {
Button,
TextEditor,
FileUploader,
usePageMeta,
} from 'frappe-ui'
import { computed, onMounted, reactive, inject } from 'vue'
import { FileText, X } from 'lucide-vue-next'
import { sessionStore } from '@/stores/session'
import { useRouter } from 'vue-router'
import { getFileSize, showToast } from '../utils'
const user = inject('$user')
const router = useRouter()
const { brand } = sessionStore()
const props = defineProps({
jobName: {
@@ -214,6 +222,7 @@ const imageResource = createResource({
const job = reactive({
job_title: '',
location: '',
country: '',
type: 'Full Time',
status: 'Open',
company_name: '',
@@ -314,9 +323,16 @@ const breadcrumbs = computed(() => {
},
{
label: props.jobName == 'new' ? 'New Job' : 'Edit Job',
route: { name: 'JobCreation' },
route: { name: 'JobForm' },
},
]
return crumbs
})
usePageMeta(() => {
return {
title: props.jobName == 'new' ? 'New Job' : jobDetail.data?.title,
icon: brand.favicon,
}
})
</script>

View File

@@ -10,13 +10,13 @@
<router-link
v-if="user.data?.name"
:to="{
name: 'JobCreation',
name: 'JobForm',
params: {
jobName: 'new',
},
}"
>
<Button variant="solid">
<Button v-if="!readOnlyMode" variant="solid">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
@@ -25,43 +25,48 @@
</router-link>
</header>
<div>
<div class="lg:w-3/4 mx-auto p-5">
<div
class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between w-full md:w-4/5 mx-auto p-5"
>
<div
class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
v-if="jobCount"
class="text-xl font-semibold text-ink-gray-7 mb-4 md:mb-0"
>
<div class="text-xl text-ink-gray-9 font-semibold">
{{ __('Find the perfect job for you') }}
</div>
<div class="grid grid-cols-2 gap-2">
<FormControl
type="text"
:placeholder="__('Search')"
v-model="searchQuery"
class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40"
@input="updateJobs"
>
<template #prefix>
<Search
class="w-4 h-4 stroke-1.5 text-ink-gray-5"
name="search"
/>
</template>
</FormControl>
<FormControl
v-model="jobType"
type="select"
:options="jobTypes"
class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40"
:placeholder="__('Type')"
@change="updateJobs"
/>
</div>
{{ __('{0} Open Jobs').format(jobCount) }}
</div>
<div
v-if="jobs.data?.length"
class="grid grid-cols-1 lg:grid-cols-2 gap-5"
>
<div class="grid grid-cols-1 md:grid-cols-3 gap-2">
<FormControl
type="text"
:placeholder="__('Search')"
v-model="searchQuery"
class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40"
@input="updateJobs"
>
<template #prefix>
<Search
class="w-4 h-4 stroke-1.5 text-ink-gray-5"
name="search"
/>
</template>
</FormControl>
<Link
doctype="Country"
v-model="country"
:placeholder="__('Country')"
class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40"
/>
<FormControl
v-model="jobType"
type="select"
:options="jobTypes"
class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40"
:placeholder="__('Type')"
@change="updateJobs"
/>
</div>
</div>
<div v-if="jobs.data?.length" class="w-full md:w-4/5 mx-auto p-5 pt-0">
<div class="grid grid-cols-1 lg:grid-cols-3 gap-4">
<router-link
v-for="job in jobs.data"
:to="{
@@ -73,25 +78,49 @@
<JobCard :job="job" />
</router-link>
</div>
<div v-else class="text-ink-gray-7 italic p-5 w-fit mx-auto">
{{ __('No jobs posted') }}
</div>
<div
v-else
class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-56"
>
<Laptop class="size-10 mx-auto stroke-1 text-ink-gray-4" />
<div class="text-lg font-medium mb-1">
{{ __('No jobs found') }}
</div>
<div class="leading-5 w-2/5 text-center">
{{ __('There are no jobs available at the moment.') }}
</div>
<div class="leading-5 w-1/5 text-center">
{{ __('Post a new job or check again later.') }}
</div>
</div>
</div>
</div>
</template>
<script setup>
import { Button, Breadcrumbs, createResource, FormControl } from 'frappe-ui'
import { Plus, Search } from 'lucide-vue-next'
import { inject, computed, ref, onMounted } from 'vue'
import {
Button,
Breadcrumbs,
call,
createResource,
FormControl,
usePageMeta,
} from 'frappe-ui'
import { Laptop, Plus, Search } from 'lucide-vue-next'
import { sessionStore } from '../stores/session'
import { inject, computed, ref, onMounted, watch } from 'vue'
import JobCard from '@/components/JobCard.vue'
import { updateDocumentTitle } from '@/utils'
import Link from '@/components/Controls/Link.vue'
const user = inject('$user')
const jobType = ref(null)
const { brand } = sessionStore()
const searchQuery = ref('')
const country = ref(null)
const filters = ref({})
const orFilters = ref({})
const jobCount = ref(0)
const readOnlyMode = window.read_only_mode
onMounted(() => {
let queries = new URLSearchParams(location.search)
@@ -99,6 +128,7 @@ onMounted(() => {
jobType.value = queries.get('type')
}
updateJobs()
getJobCount()
})
const jobs = createResource({
@@ -136,8 +166,30 @@ const updateFilters = () => {
} else {
orFilters.value = {}
}
if (country.value) {
filters.value.country = country.value
} else {
delete filters.value.country
}
}
const getJobCount = () => {
call('frappe.client.get_count', {
doctype: 'Job Opportunity',
filters: {
status: 'Open',
disabled: 0,
},
}).then((data) => {
jobCount.value = data
})
}
watch(country, (val) => {
updateJobs()
})
const jobTypes = computed(() => {
return [
'',
@@ -147,12 +199,11 @@ const jobTypes = computed(() => {
{ label: __('Freelance'), value: 'Freelance' },
]
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: 'Jobs',
description: 'An open job board for the community',
title: __('Jobs'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -4,166 +4,237 @@
class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs class="h-7" :items="breadcrumbs" />
<CertificationLinks :courseName="courseName" />
<div class="flex items-center space-x-2">
<Tooltip v-if="canGoZen()" :text="__('Zen Mode')">
<Button @click="goFullScreen()">
<template #icon>
<Focus class="w-4 h-4 stroke-2" />
</template>
</Button>
</Tooltip>
<CertificationLinks :courseName="courseName" />
</div>
</header>
<div class="grid md:grid-cols-[70%,30%] h-screen">
<div
v-if="lesson.data.no_preview"
class="border-r text-center pt-10 px-5 md:px-0 pb-10"
>
<p class="mb-4">
{{
__(
'This lesson is not available for preview. Please enroll in the course to access it.'
)
}}
</p>
<Button v-if="user.data" @click="enrollStudent()" variant="solid">
{{ __('Start Learning') }}
</Button>
<Button v-else @click="redirectToLogin()">
{{ __('Login') }}
</Button>
</div>
<div v-else class="border-r container pt-5 pb-10 px-5">
<div class="flex flex-col md:flex-row md:items-center justify-between">
<div class="text-3xl font-semibold text-ink-gray-9">
{{ lesson.data.title }}
<div v-if="lesson.data.no_preview" class="border-r">
<div class="shadow rounded-md w-3/4 mt-10 mx-auto text-center p-4">
<div class="flex items-center justify-center mt-4 space-x-2">
<LockKeyholeIcon class="size-4 stroke-2 text-ink-gray-5" />
<div class="text-lg font-semibold text-ink-gray-7">
{{ __('This lesson is locked') }}
</div>
</div>
<div class="flex items-center mt-2 md:mt-0">
<router-link
v-if="lesson.data.prev"
:to="{
name: 'Lesson',
params: {
courseName: courseName,
chapterNumber: lesson.data.prev.split('.')[0],
lessonNumber: lesson.data.prev.split('.')[1],
},
}"
>
<Button class="mr-2">
<template #prefix>
<ChevronLeft class="w-4 h-4 stroke-1" />
</template>
<span>
{{ __('Previous') }}
</span>
</Button>
</router-link>
<router-link
v-if="allowEdit()"
:to="{
name: 'LessonForm',
params: {
courseName: courseName,
chapterNumber: props.chapterNumber,
lessonNumber: props.lessonNumber,
},
}"
>
<Button class="mr-2">
{{ __('Edit') }}
</Button>
</router-link>
<router-link
v-if="lesson.data.next"
:to="{
name: 'Lesson',
params: {
courseName: courseName,
chapterNumber: lesson.data.next.split('.')[0],
lessonNumber: lesson.data.next.split('.')[1],
},
}"
>
<Button>
<template #suffix>
<ChevronRight class="w-4 h-4 stroke-1" />
</template>
<span>
{{ __('Next') }}
</span>
</Button>
</router-link>
<router-link
v-else
:to="{
name: 'CourseDetail',
params: { courseName: courseName },
}"
>
<Button>
{{ __('Back to Course') }}
</Button>
</router-link>
<div class="mt-1 mb-4 text-ink-gray-7">
{{
__(
'This lesson is not available for preview. Please enroll in the course to access it.'
)
}}
</div>
</div>
<div class="flex items-center mt-2">
<span
class="h-6 mr-1"
:class="{
'avatar-group overlap': lesson.data.instructors?.length > 1,
}"
<Button
v-if="user.data && !lesson.data.disable_self_learning"
@click="enrollStudent()"
variant="solid"
>
<UserAvatar
v-for="instructor in lesson.data.instructors"
:user="instructor"
/>
</span>
<CourseInstructors
v-if="lesson.data?.instructors"
:instructors="lesson.data.instructors"
/>
{{ __('Start Learning') }}
</Button>
<Badge
theme="blue"
size="lg"
v-else-if="lesson.data.disable_self_learning"
class="mt-2"
>
{{ __('Contact the Administrator to enroll for this course.') }}
</Badge>
<Button v-else @click="redirectToLogin()">
<template #prefix>
<LogIn class="w-4 h-4 stroke-1" />
</template>
{{ __('Login') }}
</Button>
</div>
</div>
<div
v-else
ref="lessonContainer"
class="bg-surface-white"
:class="{
'overflow-y-auto': zenModeEnabled,
}"
>
<div
v-if="
lesson.data.instructor_content &&
JSON.parse(lesson.data.instructor_content)?.blocks?.length > 1 &&
allowInstructorContent()
"
class="bg-surface-gray-2 p-3 rounded-md mt-6"
class="border-r container pt-5 pb-10 px-5 h-full"
:class="{
'w-full md:w-3/4 mx-auto border-none !pt-10': zenModeEnabled,
}"
>
<div class="text-ink-gray-5 font-medium">
{{ __('Instructor Notes') }}
<div
class="flex flex-col md:flex-row md:items-center justify-between"
>
<div class="flex flex-col">
<div class="text-3xl font-semibold text-ink-gray-9">
{{ lesson.data.title }}
</div>
<div
v-if="zenModeEnabled"
class="relative flex items-center space-x-2 text-sm mt-1 text-ink-gray-7 group w-fit mt-2"
>
<span>
{{ lesson.data.chapter_title }} -
{{ lesson.data.course_title }}
</span>
<Info class="size-3" />
<div
class="hidden group-hover:block rounded bg-gray-900 px-2 py-1 text-xs text-white shadow-xl absolute left-0 top-full mt-2"
>
{{ Math.ceil(lesson.data.membership.progress) }}%
{{ __('completed') }}
</div>
</div>
</div>
<div class="flex items-center space-x-2 mt-2 md:mt-0">
<Button v-if="zenModeEnabled" @click="showDiscussionsInZenMode()">
<template #icon>
<MessageCircleQuestion class="w-4 h-4 stroke-1.5" />
</template>
</Button>
<router-link
v-if="lesson.data.prev"
:to="{
name: 'Lesson',
params: {
courseName: courseName,
chapterNumber: lesson.data.prev.split('.')[0],
lessonNumber: lesson.data.prev.split('.')[1],
},
}"
>
<Button>
<template #prefix>
<ChevronLeft class="w-4 h-4 stroke-1" />
</template>
<span>
{{ __('Previous') }}
</span>
</Button>
</router-link>
<router-link
v-if="allowEdit()"
:to="{
name: 'LessonForm',
params: {
courseName: courseName,
chapterNumber: props.chapterNumber,
lessonNumber: props.lessonNumber,
},
}"
>
<Button>
{{ __('Edit') }}
</Button>
</router-link>
<router-link
v-if="lesson.data.next"
:to="{
name: 'Lesson',
params: {
courseName: courseName,
chapterNumber: lesson.data.next.split('.')[0],
lessonNumber: lesson.data.next.split('.')[1],
},
}"
>
<Button>
<template #suffix>
<ChevronRight class="w-4 h-4 stroke-1" />
</template>
<span>
{{ __('Next') }}
</span>
</Button>
</router-link>
<router-link
v-else
:to="{
name: 'CourseDetail',
params: { courseName: courseName },
}"
>
<Button>
{{ __('Back to Course') }}
</Button>
</router-link>
</div>
</div>
<div v-if="!zenModeEnabled" class="flex items-center mt-2">
<span
class="h-6 mr-1"
:class="{
'avatar-group overlap': lesson.data.instructors?.length > 1,
}"
>
<UserAvatar
v-for="instructor in lesson.data.instructors"
:user="instructor"
/>
</span>
<CourseInstructors
v-if="lesson.data?.instructors"
:instructors="lesson.data.instructors"
/>
</div>
<div
v-if="
lesson.data.instructor_content &&
JSON.parse(lesson.data.instructor_content)?.blocks?.length > 1 &&
allowInstructorContent()
"
class="bg-surface-gray-2 p-3 rounded-md mt-6"
>
<div class="text-ink-gray-5 font-medium">
{{ __('Instructor Notes') }}
</div>
<div
id="instructor-content"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal"
></div>
</div>
<div
id="instructor-content"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal"
></div>
</div>
<div
v-else-if="lesson.data.instructor_notes"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-6"
>
<LessonContent :content="lesson.data.instructor_notes" />
</div>
<div
v-if="lesson.data.content"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-5"
>
<div id="editor"></div>
</div>
<div
v-else
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-5"
>
<LessonContent
v-if="lesson.data?.body"
:content="lesson.data.body"
:youtube="lesson.data.youtube"
:quizId="lesson.data.quiz_id"
/>
</div>
<div class="mt-20">
<Discussions
v-if="allowDiscussions"
:title="'Questions'"
:doctype="'Course Lesson'"
:docname="lesson.data.name"
:key="lesson.data.name"
/>
v-else-if="lesson.data.instructor_notes"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-8"
>
<LessonContent :content="lesson.data.instructor_notes" />
</div>
<div
v-if="lesson.data.content"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-8"
>
<div id="editor"></div>
</div>
<div
v-else
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-8"
>
<LessonContent
v-if="lesson.data?.body"
:content="lesson.data.body"
:youtube="lesson.data.youtube"
:quizId="lesson.data.quiz_id"
/>
</div>
<div class="mt-20" ref="discussionsContainer">
<Discussions
v-if="allowDiscussions"
:title="'Questions'"
:doctype="'Course Lesson'"
:docname="lesson.data.name"
:key="lesson.data.name"
/>
</div>
</div>
</div>
<div class="sticky top-10">
@@ -193,14 +264,38 @@
</div>
</template>
<script setup>
import { createResource, Breadcrumbs, Button } from 'frappe-ui'
import { computed, watch, inject, ref, onMounted, onBeforeUnmount } from 'vue'
import {
createResource,
Badge,
Breadcrumbs,
Button,
Tooltip,
usePageMeta,
} from 'frappe-ui'
import {
computed,
watch,
inject,
ref,
onMounted,
onBeforeUnmount,
nextTick,
} from 'vue'
import CourseOutline from '@/components/CourseOutline.vue'
import UserAvatar from '@/components/UserAvatar.vue'
import { useRouter, useRoute } from 'vue-router'
import { ChevronLeft, ChevronRight, GraduationCap } from 'lucide-vue-next'
import {
ChevronLeft,
ChevronRight,
LockKeyholeIcon,
LogIn,
Focus,
Info,
MessageCircleQuestion,
} from 'lucide-vue-next'
import Discussions from '@/components/Discussions.vue'
import { getEditorTools, updateDocumentTitle } from '../utils'
import { getEditorTools, enablePlyr } from '@/utils'
import { sessionStore } from '@/stores/session'
import EditorJS from '@editorjs/editorjs'
import LessonContent from '@/components/LessonContent.vue'
import CourseInstructors from '@/components/CourseInstructors.vue'
@@ -214,7 +309,12 @@ const allowDiscussions = ref(false)
const editor = ref(null)
const instructorEditor = ref(null)
const lessonProgress = ref(0)
const lessonContainer = ref(null)
const zenModeEnabled = ref(false)
const hasQuiz = ref(false)
const discussionsContainer = ref(null)
const timer = ref(0)
const { brand } = sessionStore()
let timerInterval
const props = defineProps({
@@ -234,11 +334,28 @@ const props = defineProps({
onMounted(() => {
startTimer()
enablePlyr()
document.addEventListener('fullscreenchange', attachFullscreenEvent)
})
const attachFullscreenEvent = () => {
if (document.fullscreenElement) {
zenModeEnabled.value = true
allowDiscussions.value = false
} else {
zenModeEnabled.value = false
if (!hasQuiz.value) {
allowDiscussions.value = true
}
}
}
onBeforeUnmount(() => {
document.removeEventListener('fullscreenchange', attachFullscreenEvent)
})
const lesson = createResource({
url: 'lms.lms.utils.get_lesson',
cache: ['lesson', props.courseName, props.chapterNumber, props.lessonNumber],
makeParams(values) {
return {
course: props.courseName,
@@ -247,36 +364,37 @@ const lesson = createResource({
}
},
auto: true,
onSuccess(data) {
if (Object.keys(data).length === 0) {
router.push({
name: 'CourseDetail',
params: { courseName: props.courseName },
})
return
}
lessonProgress.value = data.membership?.progress
if (data.content) editor.value = renderEditor('editor', data.content)
if (
data.instructor_content &&
JSON.parse(data.instructor_content)?.blocks?.length > 1
)
instructorEditor.value = renderEditor(
'instructor-content',
data.instructor_content
)
editor.value?.isReady.then(() => {
checkIfDiscussionsAllowed()
})
if (!editor.value && data.body) {
const quizRegex = /\{\{ Quiz\(".*"\) \}\}/
const hasQuiz = quizRegex.test(data.body)
if (!hasQuiz) allowDiscussions.value = true
}
},
})
const setupLesson = (data) => {
if (Object.keys(data).length === 0) {
router.push({
name: 'CourseDetail',
params: { courseName: props.courseName },
})
return
}
lessonProgress.value = data.membership?.progress
if (data.content) editor.value = renderEditor('editor', data.content)
if (
data.instructor_content &&
JSON.parse(data.instructor_content)?.blocks?.length > 1
)
instructorEditor.value = renderEditor(
'instructor-content',
data.instructor_content
)
editor.value?.isReady.then(() => {
checkIfDiscussionsAllowed()
})
if (!editor.value && data.body) {
const quizRegex = /\{\{ Quiz\(".*"\) \}\}/
hasQuiz.value = quizRegex.test(data.body)
if (!hasQuiz.value && !zenModeEnabled) allowDiscussions.value = true
}
}
const renderEditor = (holder, content) => {
// empty the holder
if (document.getElementById(holder))
@@ -346,10 +464,18 @@ watch(
clearInterval(timerInterval)
timer.value = 0
startTimer()
enablePlyr()
}
}
)
watch(
() => lesson.data,
(data) => {
setupLesson(data)
}
)
const startTimer = () => {
timerInterval = setInterval(() => {
timer.value++
@@ -365,13 +491,13 @@ onBeforeUnmount(() => {
})
const checkIfDiscussionsAllowed = () => {
let quizPresent = false
JSON.parse(lesson.data?.content)?.blocks?.forEach((block) => {
if (block.type === 'quiz') quizPresent = true
if (block.type === 'quiz') hasQuiz.value = true
})
if (
!quizPresent &&
!hasQuiz.value &&
!zenModeEnabled.value &&
(lesson.data?.membership ||
user.data?.is_moderator ||
user.data?.is_instructor)
@@ -380,6 +506,7 @@ const checkIfDiscussionsAllowed = () => {
}
const allowEdit = () => {
if (window.read_only_mode) return false
if (user.data?.is_moderator) return true
if (lesson.data?.instructors?.includes(user.data?.name)) return true
return false
@@ -415,18 +542,58 @@ const enrollStudent = () => {
)
}
const canGoZen = () => {
if (
user.data?.is_moderator ||
user.data?.is_instructor ||
user.data?.is_evaluator
)
return false
if (lesson.data?.membership) return true
return false
}
const goFullScreen = () => {
if (lessonContainer.value.requestFullscreen) {
lessonContainer.value.requestFullscreen()
} else if (lessonContainer.value.mozRequestFullScreen) {
lessonContainer.value.mozRequestFullScreen()
} else if (lessonContainer.value.webkitRequestFullscreen) {
lessonContainer.value.webkitRequestFullscreen()
} else if (lessonContainer.value.msRequestFullscreen) {
lessonContainer.value.msRequestFullscreen()
}
}
const showDiscussionsInZenMode = () => {
if (allowDiscussions.value) {
allowDiscussions.value = false
} else {
allowDiscussions.value = true
scrollDiscussionsIntoView()
}
}
const scrollDiscussionsIntoView = () => {
nextTick(() => {
discussionsContainer.value?.scrollIntoView({
behavior: 'smooth',
block: 'center',
inline: 'nearest',
})
})
}
const redirectToLogin = () => {
window.location.href = `/login?redirect-to=/lms/courses/${props.courseName}`
}
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: lesson.data?.title,
description: lesson.data?.course,
title: lesson?.data?.title,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>
<style>
.avatar-group {
@@ -590,4 +757,30 @@ updateDocumentTitle(pageMeta)
.tc-table {
border-left: 1px solid #e8e8eb;
}
.plyr__volume input[type='range'] {
display: none;
}
.plyr__control--overlaid {
background: radial-gradient(
circle,
rgba(0, 0, 0, 0.4) 0%,
rgba(0, 0, 0, 0.5) 50%
);
}
.plyr__control:hover {
background: none;
}
.plyr--video {
border: 1px solid theme('colors.gray.200');
border-radius: 8px;
}
:root {
--plyr-range-fill-background: white;
--plyr-video-control-background-hover: transparent;
}
</style>

View File

@@ -78,7 +78,13 @@
</div>
</template>
<script setup>
import { Breadcrumbs, Button, createResource, FormControl } from 'frappe-ui'
import {
Breadcrumbs,
Button,
createResource,
FormControl,
usePageMeta,
} from 'frappe-ui'
import {
computed,
reactive,
@@ -87,13 +93,15 @@ import {
ref,
onBeforeUnmount,
} from 'vue'
import { sessionStore } from '../stores/session'
import EditorJS from '@editorjs/editorjs'
import LessonHelp from '@/components/LessonHelp.vue'
import { ChevronRight } from 'lucide-vue-next'
import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
import { createToast, getEditorTools, enablePlyr } from '@/utils'
import { capture } from '@/telemetry'
import { useOnboarding } from 'frappe-ui/frappe'
const { brand } = sessionStore()
const editor = ref(null)
const instructorEditor = ref(null)
const user = inject('$user')
@@ -125,6 +133,7 @@ onMounted(() => {
editor.value = renderEditor('content')
instructorEditor.value = renderEditor('instructor-notes')
window.addEventListener('keydown', keyboardShortcut)
enablePlyr()
})
const renderEditor = (holder) => {
@@ -133,6 +142,9 @@ const renderEditor = (holder) => {
tools: getEditorTools(true),
autofocus: true,
defaultBlock: 'markdown',
onChange: async (api, event) => {
enablePlyr()
},
})
}
@@ -394,8 +406,10 @@ const createNewLesson = () => {
{ lesson: data.name },
{
onSuccess() {
if (user.data?.is_system_manager)
updateOnboardingStep('create_first_lesson')
capture('lesson_created')
updateOnboardingStep('create_first_lesson')
showToast('Success', 'Lesson created successfully', 'check')
lessonDetails.reload()
},
@@ -492,14 +506,14 @@ const breadcrumbs = computed(() => {
return crumbs
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: 'Lesson Editor',
description: 'Create and edit lessons for your course',
title: lessonDetails?.data?.lesson
? lessonDetails.data.lesson.title
: 'New Lesson',
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>
<style>
.embed-tool__caption,
@@ -614,8 +628,7 @@ updateDocumentTitle(pageMeta)
}
iframe {
border-top: 3px solid theme('colors.gray.700');
border-bottom: 3px solid theme('colors.gray.700');
border: none !important;
}
.tc-table {
@@ -629,4 +642,30 @@ iframe {
.ce-popover-item[data-item-name='markdown'] {
display: none !important;
}
.plyr__volume input[type='range'] {
display: none;
}
.plyr__control--overlaid {
background: radial-gradient(
circle,
rgba(0, 0, 0, 0.4) 0%,
rgba(0, 0, 0, 0.5) 50%
);
}
.plyr__control:hover {
background: none;
}
.plyr--video {
border: 1px solid theme('colors.gray.200');
border-radius: 8px;
}
:root {
--plyr-range-fill-background: white;
--plyr-video-control-background-hover: transparent;
}
</style>

View File

@@ -65,12 +65,14 @@ import {
TabButtons,
Button,
Tooltip,
usePageMeta,
} from 'frappe-ui'
import { sessionStore } from '../stores/session'
import { computed, inject, ref, onMounted } from 'vue'
import { useRouter } from 'vue-router'
import { X } from 'lucide-vue-next'
import { updateDocumentTitle } from '@/utils'
const { brand } = sessionStore()
const user = inject('$user')
const socket = inject('$socket')
const activeTab = ref('Unread')
@@ -145,14 +147,12 @@ const breadcrumbs = computed(() => {
return crumbs
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: 'Notifications',
description: 'All your notifications in one place.',
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>
<style>
.notification strong {

View File

@@ -0,0 +1,136 @@
<template>
<div class="flex h-screen overflow-hidden sm:bg-gray-50">
<div class="relative h-full z-10 mx-auto pt-8 sm:w-max sm:pt-32">
<div class="mx-auto flex items-center justify-center space-x-2">
<LMSLogo class="size-7" />
<span
class="select-none text-xl font-semibold tracking-tight text-gray-900"
>
Learning
</span>
</div>
<div
class="mx-auto w-full h-fit bg-white py-8 sm:mt-6 sm:w-96 sm:rounded-lg sm:px-8 sm:shadow-xl"
>
<div class="font-medium text-center mb-8">
{{ __('Help us understand your needs') }}
</div>
<div class="mb-5">
<div class="text-sm text-gray-700 mb-2">
{{ __('What is your main use case for Frappe Learning?') }}
</div>
<FormControl
v-model="persona.useCase"
type="select"
:options="useCaseOptions"
/>
</div>
<div class="mb-5">
<div class="text-sm text-gray-700 mb-2">
{{ __('How many students are you planning to teach?') }}
</div>
<FormControl
v-model="persona.noOfStudents"
type="select"
:options="noOfStudentsOptions"
/>
</div>
<div class="flex w-full">
<Button variant="solid" class="mx-auto" @click="submitPersona()">
{{ __('Submit and Continue') }}
</Button>
</div>
</div>
<div
class="text-center absolute bottom-0 right-0 left-0 mx-auto cursor-pointer text-sm pb-4"
@click="skipPersonaForm()"
>
{{ __('Skip') }}
</div>
</div>
</div>
</template>
<script setup>
import LMSLogo from '@/components/Icons/LMSLogo.vue'
import { Button, call, FormControl, usePageMeta } from 'frappe-ui'
import { computed, inject, reactive } from 'vue'
import { useRouter } from 'vue-router'
import { sessionStore } from '@/stores/session'
const user = inject('$user')
const router = useRouter()
const { brand } = sessionStore()
const persona = reactive({
noOfStudents: null,
useCase: null,
})
const submitPersona = () => {
let responses = {
site: user.data?.sitename,
no_of_students: persona.noOfStudents,
use_case: persona.useCase,
}
call('lms.lms.api.capture_user_persona', {
responses: JSON.stringify(responses),
}).then(() => {
router.push({
name: 'Courses',
})
})
}
const skipPersonaForm = () => {
call('frappe.client.set_value', {
doctype: 'LMS Settings',
name: null,
fieldname: 'persona_captured',
value: 1,
}).then(() => {
router.push({
name: 'Courses',
})
})
}
const noOfStudentsOptions = computed(() => {
const options = [
'Less than 50',
'50-200',
'200-1000',
'1000+',
'Not sure yet',
]
return options.map((option) => ({
label: option,
value: option,
}))
})
const useCaseOptions = computed(() => {
const options = [
'Teaching students in a school/university',
'Training employees in my company',
'Onboarding and educating my users/community',
'Selling courses and earning income',
'Other',
]
return options.map((option) => ({
label: option,
value: option,
}))
})
usePageMeta(() => {
return {
title: 'Persona',
icon: brand.favicon,
}
})
</script>

View File

@@ -25,7 +25,11 @@
@select="(imageUrl) => coverImage.submit({ url: imageUrl })"
>
<template v-slot="{ togglePopover }">
<Button variant="outline" @click="togglePopover()">
<Button
v-if="!readOnlyMode"
variant="outline"
@click="togglePopover()"
>
<template #prefix>
<Edit class="w-4 h-4 stroke-1.5 text-ink-gray-7" />
</template>
@@ -58,7 +62,7 @@
</div>
</div>
<Button
v-if="isSessionUser()"
v-if="isSessionUser() && !readOnlyMode"
class="mt-3 sm:mt-0 md:ml-auto"
@click="editProfile()"
>
@@ -86,23 +90,30 @@
/>
</template>
<script setup>
import { Breadcrumbs, createResource, Button, TabButtons } from 'frappe-ui'
import {
Breadcrumbs,
createResource,
Button,
TabButtons,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, watch, ref, onMounted, watchEffect } from 'vue'
import { sessionStore } from '@/stores/session'
import { Edit } from 'lucide-vue-next'
import UserAvatar from '@/components/UserAvatar.vue'
import { useRoute, useRouter } from 'vue-router'
import NoPermission from '@/components/NoPermission.vue'
import { convertToTitleCase, updateDocumentTitle } from '@/utils'
import { convertToTitleCase } from '@/utils'
import EditProfile from '@/components/Modals/EditProfile.vue'
import EditCoverImage from '@/components/Modals/EditCoverImage.vue'
const { user } = sessionStore()
const { user, brand } = sessionStore()
const $user = inject('$user')
const route = useRoute()
const router = useRouter()
const activeTab = ref('')
const showProfileModal = ref(false)
const readOnlyMode = window.read_only_mode
const props = defineProps({
username: {
@@ -215,12 +226,10 @@ const breadcrumbs = computed(() => {
return crumbs
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: profile.data?.full_name,
description: profile.data?.headline,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -4,134 +4,150 @@
{{ __('My availability') }}
</h2>
<div class="">
<div
class="grid grid-cols-3 md:grid-cols-4 gap-4 text-sm text-ink-gray-7 mb-4"
>
<div>
{{ __('Day') }}
</div>
<div>
{{ __('Start Time') }}
</div>
<div>
{{ __('End Time') }}
</div>
</div>
<div
v-if="evaluator.data"
v-for="slot in evaluator.data.slots.schedule"
class="grid grid-cols-3 md:grid-cols-4 gap-4 mb-4 group"
>
<FormControl
type="select"
:options="days"
v-model="slot.day"
@focusout.stop="update(slot.name, 'day', slot.day)"
/>
<FormControl
type="time"
v-model="slot.start_time"
@focusout.stop="update(slot.name, 'start_time', slot.start_time)"
/>
<FormControl
type="time"
v-model="slot.end_time"
@focusout.stop="update(slot.name, 'end_time', slot.end_time)"
/>
<X
@click="deleteRow(slot.name)"
class="w-6 h-auto stroke-1.5 text-red-900 rounded-md cursor-pointer p-1 bg-surface-red-2 hidden group-hover:block"
/>
</div>
<div
class="grid grid-cols-3 md:grid-cols-4 gap-4 mb-4"
v-show="showSlotsTemplate"
>
<FormControl
type="select"
:options="days"
v-model="newSlot.day"
@focusout.stop="add()"
/>
<FormControl
type="time"
v-model="newSlot.start_time"
@focusout.stop="add()"
/>
<FormControl
type="time"
v-model="newSlot.end_time"
@focusout.stop="add()"
/>
</div>
<Button @click="showSlotsTemplate = 1">
<template #prefix>
<Plus class="w-4 h-4 stroke-1.5 text-ink-gray-7" />
</template>
{{ __('Add Slot') }}
</Button>
<div
v-if="readOnlyMode"
class="flex items-center space-x-2 text-sm text-ink-gray-7 bg-surface-gray-1 px-3 py-2 rounded-md w-full text-center"
>
<CircleAlert class="size-4 stroke-1.5" />
<span>
{{
__(
'You cannot change the availability when the site is being updated.'
)
}}
</span>
</div>
<div class="my-10">
<h2 class="mb-4 text-lg font-semibold text-ink-gray-9">
{{ __('I am unavailable') }}
</h2>
<div class="grid grid-cols-2 md:grid-cols-4 gap-4">
<FormControl
type="date"
:label="__('From')"
v-model="from"
@blur="
() => {
updateUnavailability.submit({
field: 'unavailable_from',
value: from,
})
}
"
/>
<FormControl
type="date"
:label="__('To')"
v-model="to"
@blur="
() => {
updateUnavailability.submit({
field: 'unavailable_to',
value: to,
})
}
"
/>
<div v-else>
<div>
<div
class="grid grid-cols-3 md:grid-cols-4 gap-4 text-sm text-ink-gray-7 mb-4"
>
<div>
{{ __('Day') }}
</div>
<div>
{{ __('Start Time') }}
</div>
<div>
{{ __('End Time') }}
</div>
</div>
<div
v-if="evaluator.data"
v-for="slot in evaluator.data.slots.schedule"
class="grid grid-cols-3 md:grid-cols-4 gap-4 mb-4 group"
>
<FormControl
type="select"
:options="days"
v-model="slot.day"
@focusout.stop="update(slot.name, 'day', slot.day)"
/>
<FormControl
type="time"
v-model="slot.start_time"
@focusout.stop="update(slot.name, 'start_time', slot.start_time)"
/>
<FormControl
type="time"
v-model="slot.end_time"
@focusout.stop="update(slot.name, 'end_time', slot.end_time)"
/>
<X
@click="deleteRow(slot.name)"
class="w-6 h-auto stroke-1.5 text-red-900 rounded-md cursor-pointer p-1 bg-surface-red-2 hidden group-hover:block"
/>
</div>
<div
class="grid grid-cols-3 md:grid-cols-4 gap-4 mb-4"
v-show="showSlotsTemplate"
>
<FormControl
type="select"
:options="days"
v-model="newSlot.day"
@focusout.stop="add()"
/>
<FormControl
type="time"
v-model="newSlot.start_time"
@focusout.stop="add()"
/>
<FormControl
type="time"
v-model="newSlot.end_time"
@focusout.stop="add()"
/>
</div>
<Button @click="showSlotsTemplate = 1">
<template #prefix>
<Plus class="w-4 h-4 stroke-1.5 text-ink-gray-7" />
</template>
{{ __('Add Slot') }}
</Button>
</div>
</div>
<div>
<h2 class="mb-4 text-lg font-semibold text-ink-gray-9">
{{ __('My calendar') }}
</h2>
<div
v-if="evaluator.data?.calendar && evaluator.data?.is_authorized"
class="flex items-center bg-surface-green-2 text-green-900 text-sm p-1 rounded-md mb-4 w-fit"
>
<Check class="h-4 w-4 stroke-1.5 mr-2" />
{{ __('Your calendar is set.') }}
<div class="my-10">
<h2 class="mb-4 text-lg font-semibold text-ink-gray-9">
{{ __('I am unavailable') }}
</h2>
<div class="grid grid-cols-2 md:grid-cols-4 gap-4">
<FormControl
type="date"
:label="__('From')"
v-model="from"
@blur="
() => {
updateUnavailability.submit({
field: 'unavailable_from',
value: from,
})
}
"
/>
<FormControl
type="date"
:label="__('To')"
v-model="to"
@blur="
() => {
updateUnavailability.submit({
field: 'unavailable_to',
value: to,
})
}
"
/>
</div>
</div>
<div>
<h2 class="mb-4 text-lg font-semibold text-ink-gray-9">
{{ __('My calendar') }}
</h2>
<div
v-if="evaluator.data?.calendar && evaluator.data?.is_authorized"
class="flex items-center bg-surface-green-2 text-green-900 text-sm p-1 rounded-md mb-4 w-fit"
>
<Check class="h-4 w-4 stroke-1.5 mr-2" />
{{ __('Your calendar is set.') }}
</div>
<Button @click="() => authorizeCalendar.submit()">
{{ __('Authorize Google Calendar Access') }}
</Button>
</div>
<Button @click="() => authorizeCalendar.submit()">
{{ __('Authorize Google Calendar Access') }}
</Button>
</div>
</div>
</template>
<script setup>
import { createResource, FormControl, Button } from 'frappe-ui'
import { createResource, FormControl, Button, Badge } from 'frappe-ui'
import { computed, reactive, ref, onMounted, inject } from 'vue'
import { showToast, convertToTitleCase } from '@/utils'
import { Plus, X, Check } from 'lucide-vue-next'
import { Plus, X, Check, CircleAlert } from 'lucide-vue-next'
const user = inject('$user')
const readOnlyMode = window.read_only_mode
const props = defineProps({
profile: {

View File

@@ -4,6 +4,16 @@
{{ __('Settings') }}
</h2>
<div
v-if="readOnlyMode"
class="flex items-center space-x-2 text-sm text-ink-gray-7 bg-surface-gray-1 px-3 py-2 rounded-md w-full text-center"
>
<CircleAlert class="size-4 stroke-1.5" />
<span>
{{ __('You cannot change the roles in read-only mode.') }}
</span>
</div>
<div
v-else
class="flex flex-col md:flex-row gap-4 md:gap-0 justify-between w-3/4 mt-5"
>
<FormControl
@@ -37,11 +47,13 @@
import { FormControl, createResource } from 'frappe-ui'
import { ref } from 'vue'
import { showToast, convertToTitleCase } from '@/utils'
import { CircleAlert } from 'lucide-vue-next'
const moderator = ref(false)
const course_creator = ref(false)
const batch_evaluator = ref(false)
const lms_student = ref(false)
const readOnlyMode = window.read_only_mode
const props = defineProps({
profile: {

View File

@@ -13,7 +13,7 @@
<!-- Courses -->
<div>
<div class="flex items-center justify-between mb-2">
<div class="text-lg font-semibold">
<div class="text-lg text-ink-gray-9 font-semibold">
{{ __('Program Courses') }}
</div>
<Button
@@ -75,7 +75,7 @@
<!-- Members -->
<div>
<div class="flex items-center justify-between mb-2">
<div class="text-lg font-semibold">
<div class="text-lg text-ink-gray-9 font-semibold">
{{ __('Program Members') }}
</div>
<Button
@@ -186,14 +186,17 @@ import {
ListHeader,
ListHeaderItem,
ListSelectBanner,
usePageMeta,
} from 'frappe-ui'
import { computed, ref } from 'vue'
import { Plus, Trash2 } from 'lucide-vue-next'
import Link from '@/components/Controls/Link.vue'
import { showToast } from '@/utils/'
import Draggable from 'vuedraggable'
import { useRouter } from 'vue-router'
import { sessionStore } from '../stores/session'
import Draggable from 'vuedraggable'
import Link from '@/components/Controls/Link.vue'
const { brand } = sessionStore()
const showDialog = ref(false)
const currentForm = ref(null)
const course = ref(null)
@@ -364,4 +367,11 @@ const breadbrumbs = computed(() => {
},
]
})
usePageMeta(() => {
return {
title: program.doc?.title,
icon: brand.favicon,
}
})
</script>

View File

@@ -4,7 +4,7 @@
>
<Breadcrumbs :items="breadbrumbs" />
<Button
v-if="user.data?.is_moderator || user.data?.is_instructor"
v-if="canCreateProgram()"
@click="showDialog = true"
variant="solid"
>
@@ -46,7 +46,7 @@
params: { programName: program.name },
}"
>
<Button>
<Button v-if="!readOnlyMode">
<template #prefix>
<Edit class="h-4 w-4 stroke-1.5" />
</template>
@@ -126,19 +126,23 @@ import {
createResource,
Dialog,
FormControl,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, onMounted, ref } from 'vue'
import { BookOpen, Edit, Plus, LockKeyhole } from 'lucide-vue-next'
import CourseCard from '@/components/CourseCard.vue'
import { useRouter } from 'vue-router'
import { sessionStore } from '../stores/session'
import { showToast } from '@/utils'
import { useSettings } from '@/stores/settings'
const { brand } = sessionStore()
const user = inject('$user')
const showDialog = ref(false)
const router = useRouter()
const title = ref('')
const settings = useSettings()
const readOnlyMode = window.read_only_mode
onMounted(() => {
if (
@@ -205,9 +209,22 @@ const lockCourse = (course) => {
return true
}
const canCreateProgram = () => {
if (readOnlyMode) return false
if (user.data?.is_moderator || user.data?.is_instructor) return true
return false
}
const breadbrumbs = computed(() => [
{
label: 'Programs',
label: __('Programs'),
},
])
usePageMeta(() => {
return {
title: __('Programs'),
icon: brand.favicon,
}
})
</script>

View File

@@ -3,7 +3,7 @@
class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs :items="breadcrumbs" />
<div class="space-x-2">
<div v-if="!readOnlyMode" class="space-x-2">
<router-link
v-if="quizDetails.data?.name"
:to="{
@@ -38,7 +38,7 @@
<div class="w-3/4 mx-auto py-5">
<!-- Details -->
<div class="mb-8">
<div class="font-semibold mb-4">
<div class="font-semibold text-ink-gray-9 mb-4">
{{ __('Details') }}
</div>
<FormControl
@@ -75,7 +75,7 @@
<!-- Settings -->
<div class="mb-8">
<div class="font-semibold mb-4">
<div class="font-semibold text-ink-gray-9 mb-4">
{{ __('Settings') }}
</div>
<div class="grid grid-cols-3 gap-5 my-4">
@@ -93,7 +93,7 @@
</div>
<div class="mb-8">
<div class="font-semibold mb-4">
<div class="font-semibold text-ink-gray-9 mb-4">
{{ __('Shuffle Settings') }}
</div>
<div class="grid grid-cols-3">
@@ -113,10 +113,10 @@
<!-- Questions -->
<div>
<div class="flex items-center justify-between mb-4">
<div class="font-semibold">
<div class="font-semibold text-ink-gray-9">
{{ __('Questions') }}
</div>
<Button @click="openQuestionModal()">
<Button v-if="!readOnlyMode" @click="openQuestionModal()">
<template #prefix>
<Plus class="w-4 h-4" />
</template>
@@ -197,6 +197,7 @@ import {
ListRowItem,
ListSelectBanner,
Button,
usePageMeta,
} from 'frappe-ui'
import {
computed,
@@ -207,11 +208,13 @@ import {
onBeforeUnmount,
watch,
} from 'vue'
import { sessionStore } from '../stores/session'
import { Plus, Trash2 } from 'lucide-vue-next'
import Question from '@/components/Modals/Question.vue'
import { showToast, updateDocumentTitle } from '@/utils'
import { useRouter } from 'vue-router'
import Question from '@/components/Modals/Question.vue'
const { brand } = sessionStore()
const showQuestionModal = ref(false)
const currentQuestion = reactive({
question: '',
@@ -220,6 +223,7 @@ const currentQuestion = reactive({
})
const user = inject('$user')
const router = useRouter()
const readOnlyMode = window.read_only_mode
const props = defineProps({
quizID: {
@@ -441,11 +445,7 @@ const breadcrumbs = computed(() => {
},
},
]
/* if (quizDetails.data) {
crumbs.push({
label: quiz.title,
})
} */
crumbs.push({
label: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
route: { name: 'QuizForm', params: { quizID: props.quizID } },
@@ -453,12 +453,10 @@ const breadcrumbs = computed(() => {
return crumbs
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
description: __('Form to create and edit quizzes'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -14,11 +14,12 @@
</template>
<script setup>
import Quiz from '@/components/Quiz.vue'
import { createResource, Breadcrumbs } from 'frappe-ui'
import { createResource, Breadcrumbs, usePageMeta } from 'frappe-ui'
import { computed, inject, onMounted, ref } from 'vue'
import { useRouter } from 'vue-router'
import { updateDocumentTitle } from '@/utils'
import { sessionStore } from '../stores/session'
const { brand } = sessionStore()
const user = inject('$user')
const router = useRouter()
const fromLesson = ref(false)
@@ -56,12 +57,10 @@ const breadcrumbs = computed(() => {
return [{ label: __('Quiz Submission') }, { label: title.data?.title }]
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: title.data?.title,
description: __('Quiz Submission'),
title: `${title.data?.title}`,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -79,11 +79,14 @@ import {
FormControl,
Button,
Badge,
usePageMeta,
} from 'frappe-ui'
import { computed, onBeforeUnmount, onMounted, inject } from 'vue'
import { useRouter } from 'vue-router'
import { showToast } from '@/utils'
import { sessionStore } from '@/stores/session'
const { brand } = sessionStore()
const router = useRouter()
const user = inject('$user')
@@ -149,4 +152,11 @@ const saveSubmission = () => {
}
)
}
usePageMeta(() => {
return {
title: `${submisisonDetails.doc.quiz_title}`,
icon: brand.favicon,
}
})
</script>

View File

@@ -40,6 +40,18 @@
</Button>
</div>
</div>
<div
v-else
class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
>
<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
<div class="text-xl font-medium">
{{ __('No submissions') }}
</div>
<div class="leading-5">
{{ __('No quiz submissions found. Please check again later.') }}
</div>
</div>
</template>
<script setup>
import {
@@ -51,10 +63,14 @@ import {
ListRows,
ListHeader,
ListHeaderItem,
usePageMeta,
} from 'frappe-ui'
import { BookOpen } from 'lucide-vue-next'
import { computed, onMounted, inject } from 'vue'
import { sessionStore } from '../stores/session'
import { useRouter } from 'vue-router'
const { brand } = sessionStore()
const router = useRouter()
const user = inject('$user')
@@ -105,4 +121,11 @@ const quizColumns = computed(() => {
const breadcrumbs = computed(() => {
return [{ label: __('Quiz Submissions') }]
})
usePageMeta(() => {
return {
title: __('Quiz Submissions'),
icon: brand.favicon,
}
})
</script>

View File

@@ -4,6 +4,7 @@
>
<Breadcrumbs :items="breadcrumbs" />
<router-link
v-if="!readOnlyMode"
:to="{
name: 'QuizForm',
params: {
@@ -79,14 +80,17 @@ import {
ListRow,
ListHeader,
ListHeaderItem,
usePageMeta,
} from 'frappe-ui'
import { useRouter } from 'vue-router'
import { computed, inject, onMounted } from 'vue'
import { BookOpen, Plus } from 'lucide-vue-next'
import { updateDocumentTitle } from '@/utils'
import { sessionStore } from '@/stores/session'
const { brand } = sessionStore()
const user = inject('$user')
const router = useRouter()
const readOnlyMode = window.read_only_mode
onMounted(() => {
if (!user.data?.is_moderator && !user.data?.is_instructor) {
@@ -143,12 +147,10 @@ const breadcrumbs = computed(() => {
]
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: __('Quizzes'),
description: __('List of quizzes'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -39,11 +39,13 @@ import {
createDocumentResource,
createListResource,
createResource,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, onBeforeMount, ref } from 'vue'
import { useSidebar } from '@/stores/sidebar'
import { updateDocumentTitle } from '@/utils'
import { sessionStore } from '../stores/session'
const { brand } = sessionStore()
const sidebarStore = useSidebar()
const user = inject('$user')
const readyToRender = ref(false)
@@ -195,14 +197,10 @@ const breadcrumbs = computed(() => {
]
})
const pageMeta = computed(() => {
usePageMeta(() => {
return {
title: chapter?.doc?.title,
description: __('This is a chapter in the course {0}').format(
chapter?.doc?.course_title
),
title: chapter.doc?.title,
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -7,109 +7,115 @@
</header>
<div v-if="chartDetails.data" class="p-5">
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5 gap-4">
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<BookOpen class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.courses) }}
</div>
<div>
{{ __('Courses') }}
</div>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<LogIn class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.users) }}
</div>
<div>
{{ __('Signups') }}
</div>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<BookOpenCheck class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.enrollments) }}
</div>
<div>
{{ __('Enrollments') }}
</div>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<FileCheck class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.completions) }}
</div>
<div>
{{ __('Completions') }}
</div>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<FileCheck2 class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.lesson_completions) }}
</div>
<div class="text-ink-gray-7">
{{ __('Milestones') }}
</div>
</div>
</div>
<NumberChart
class="border rounded-md"
:config="{ title: 'Courses', value: chartDetails.data.courses }"
/>
<NumberChart
class="border rounded-md"
:config="{ title: 'Signups', value: chartDetails.data.users }"
/>
<NumberChart
class="border rounded-md"
:config="{
title: 'Enrollments',
value: chartDetails.data.enrollments,
}"
/>
<NumberChart
class="border rounded-md"
:config="{
title: 'Completions',
value: chartDetails.data.completions,
}"
/>
<NumberChart
class="border rounded-md"
:config="{
title: 'Certifications',
value: chartDetails.data.certifications,
}"
/>
</div>
<div class="grid grid-cols-1 lg:grid-cols-2 gap-4 mt-4">
<div class="border rounded-md p-5 min-h-72">
<Line
<div class="border rounded-md min-h-72">
<AxisChart
v-if="signupsChart.data"
:data="signupsChart.data"
:options="signupChartOptions()"
:config="{
data: signupsChart.data,
title: 'Signups',
subtitle: 'Signups per month',
xAxis: {
key: 'date',
type: 'time',
title: 'Date',
timeGrain: 'day',
},
yAxis: {
title: 'Signups',
},
series: [{ name: 'signups', type: 'line', showDataPoints: true }],
}"
/>
</div>
<div class="border rounded-md p-5 min-h-72">
<Line
<div class="border rounded-md min-h-72">
<AxisChart
v-if="enrollmentChart.data"
:data="enrollmentChart.data"
:options="enrollmentChartOptions()"
:config="{
data: enrollmentChart.data,
title: 'Enrollments',
subtitle: 'Enrollments per month',
xAxis: {
key: 'date',
type: 'time',
title: 'Date',
timeGrain: 'day',
},
yAxis: {
title: 'Enrollments',
},
series: [
{ name: 'enrollments', type: 'line', showDataPoints: true },
],
}"
/>
</div>
<div class="border rounded-md p-5">
<Line
v-if="lessonCompletion.data"
:data="lessonCompletion.data"
:options="lessonChartOptions()"
<div class="border rounded-md">
<AxisChart
v-if="certification.data"
:config="{
data: certification.data,
title: 'Certifications',
subtitle: 'Certifications per month',
xAxis: {
key: 'date',
type: 'time',
title: 'Date',
timeGrain: 'day',
},
yAxis: {
title: 'Certifications',
},
series: [
{
name: 'certifications',
type: 'line',
showDataPoints: true,
},
],
}"
/>
</div>
<div class="border rounded-md p-5">
<Pie
<div class="border rounded-md">
<DonutChart
v-if="courseCompletion.data"
:data="courseCompletion.data"
:options="courseChartOptions()"
:config="{
data: courseCompletion.data,
title: 'Completions',
subtitle: 'Course Completion',
categoryColumn: 'label',
valueColumn: 'value',
}"
/>
</div>
</div>
@@ -117,44 +123,18 @@
</div>
</template>
<script setup>
import { createResource, Breadcrumbs } from 'frappe-ui'
import { computed, inject } from 'vue'
import { updateDocumentTitle } from '@/utils'
import { formatNumber } from '@/utils'
import { Line, Pie } from 'vue-chartjs'
import {
Chart as ChartJS,
Title,
Tooltip,
Legend,
LineElement,
CategoryScale,
LinearScale,
PointElement,
ArcElement,
Filler,
} from 'chart.js'
AxisChart,
Breadcrumbs,
createResource,
DonutChart,
NumberChart,
usePageMeta,
} from 'frappe-ui'
import { computed } from 'vue'
import { sessionStore } from '../stores/session'
ChartJS.register(
Title,
Tooltip,
Legend,
LineElement,
CategoryScale,
LinearScale,
PointElement,
ArcElement,
Filler
)
import {
BookOpen,
LogIn,
FileCheck,
FileCheck2,
BookOpenCheck,
} from 'lucide-vue-next'
const dayjs = inject('$dayjs')
const { brand } = sessionStore()
const breadcrumbs = computed(() => {
return [
@@ -175,11 +155,18 @@ const chartDetails = createResource({
const signupsChart = createResource({
url: 'lms.lms.utils.get_chart_data',
cache: ['signups'],
params: {
chart_name: 'New Signups',
},
auto: true,
transform(data) {
return data.map((item) => {
return {
date: new Date(item.date),
signups: item.count,
}
})
},
})
const enrollmentChart = createResource({
@@ -189,15 +176,31 @@ const enrollmentChart = createResource({
chart_name: 'Course Enrollments',
},
auto: true,
transform(data) {
return data.map((item) => {
return {
date: new Date(item.date),
enrollments: item.count,
}
})
},
})
const lessonCompletion = createResource({
const certification = createResource({
url: 'lms.lms.utils.get_chart_data',
cache: ['lessonCompletion'],
cache: ['certifications'],
params: {
chart_name: 'Lesson Completion',
chart_name: 'Certification',
},
auto: true,
transform(data) {
return data.map((item) => {
return {
date: new Date(item.date),
certifications: item.count,
}
})
},
})
const courseCompletion = createResource({
@@ -206,123 +209,10 @@ const courseCompletion = createResource({
cache: ['courseCompletion'],
})
const signupChartOptions = () => {
let options = chartOptions(false)
options.plugins.title.text = 'Signups'
options.borderColor = '#4563f0'
options.backgroundColor = (ctx) => {
const canvas = ctx.chart.ctx
const gradient = canvas.createLinearGradient(0, 0, 0, 160)
gradient.addColorStop(0, '#4563f0')
gradient.addColorStop(0.5, '#e8ecfe')
gradient.addColorStop(1, '#f6f7ff')
return gradient
}
return options
}
const enrollmentChartOptions = () => {
let options = chartOptions(false)
options.plugins.title.text = 'Enrollments'
options.borderColor = '#4563f0'
options.backgroundColor = (ctx) => {
const canvas = ctx.chart.ctx
const gradient = canvas.createLinearGradient(0, 0, 0, 160)
gradient.addColorStop(0, '#4563f0')
gradient.addColorStop(0.5, '#e8ecfe')
gradient.addColorStop(1, '#f6f7ff')
return gradient
}
return options
}
const lessonChartOptions = () => {
let options = chartOptions(false)
options.plugins.title.text = 'Milestones'
options.borderColor = '#4563f0'
options.backgroundColor = (ctx) => {
const canvas = ctx.chart.ctx
const gradient = canvas.createLinearGradient(0, 0, 0, 160)
gradient.addColorStop(0, '#B6DEC5')
gradient.addColorStop(0.5, '#e8ecfe')
gradient.addColorStop(1, '#f6f7ff')
return gradient
}
return options
}
const courseChartOptions = () => {
let options = chartOptions(true)
options.plugins.title.text = 'Completions'
options.backgroundColor = ['#4563f0', '#f683ae']
return options
}
const chartOptions = (isPie) => {
usePageMeta(() => {
return {
responsive: true,
maintainAspectRatio: false,
fill: true,
borderWidth: 2,
pointRadius: 2,
pointStyle: 'cross',
ticks: {
autoSkip: true,
maxTicksLimit: 5,
},
plugins: {
legend: {
display: isPie ? true : false,
},
title: {
display: true,
align: 'start',
font: {
size: 14,
weight: '500',
},
color: '#171717',
padding: {
bottom: 20,
},
},
tooltip: {
backgroundColor: '#000',
},
},
scales: {
x: {
display: isPie ? false : true,
grid: {
display: false,
},
border: {
display: isPie ? false : true,
},
},
y: {
beginAtZero: true,
display: isPie ? false : true,
grid: {
display: false,
},
border: {
display: isPie ? false : true,
},
},
},
}
}
const pageMeta = computed(() => {
return {
title: 'Statistics',
description: 'Statistics of the platform',
title: __('Statistics'),
icon: brand.favicon,
}
})
updateDocumentTitle(pageMeta)
</script>

View File

@@ -134,8 +134,8 @@ const routes = [
},
{
path: '/job-opening/:jobName/edit',
name: 'JobCreation',
component: () => import('@/pages/JobCreation.vue'),
name: 'JobForm',
component: () => import('@/pages/JobForm.vue'),
props: true,
},
{
@@ -199,12 +199,6 @@ const routes = [
name: 'Assignments',
component: () => import('@/pages/Assignments.vue'),
},
{
path: '/assignments/:assignmentID',
name: 'AssignmentForm',
component: () => import('@/pages/AssignmentForm.vue'),
props: true,
},
{
path: '/assignment-submission/:assignmentID/:submissionName',
name: 'AssignmentSubmission',
@@ -216,6 +210,11 @@ const routes = [
name: 'AssignmentSubmissionList',
component: () => import('@/pages/AssignmentSubmissionList.vue'),
},
{
path: '/persona',
name: 'PersonaForm',
component: () => import('@/pages/PersonaForm.vue'),
},
]
let router = createRouter({

View File

@@ -2,10 +2,11 @@ import { defineStore } from 'pinia'
import { createResource } from 'frappe-ui'
import { usersStore } from './user'
import router from '@/router'
import { ref, computed } from 'vue'
import { computed, reactive, ref } from 'vue'
export const sessionStore = defineStore('lms-session', () => {
let { userResource } = usersStore()
const brand = reactive({})
function sessionUser() {
let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
@@ -46,7 +47,10 @@ export const sessionStore = defineStore('lms-session', () => {
cache: 'brand',
auto: true,
onSuccess(data) {
document.querySelector("link[rel='icon']").href = data.favicon
brand.name = data.app_name
brand.logo = data.app_logo
brand.favicon =
data.favicon?.file_url || '/assets/lms/frontend/learning.svg'
},
})
@@ -61,6 +65,7 @@ export const sessionStore = defineStore('lms-session', () => {
isLoggedIn,
login,
logout,
brand,
branding,
sidebarSettings,
}

View File

@@ -9,15 +9,9 @@ export const useSettings = defineStore('settings', () => {
const activeTab = ref(null)
const learningPaths = createResource({
url: 'frappe.client.get_single_value',
makeParams(values) {
return {
doctype: 'LMS Settings',
field: 'enable_learning_paths',
}
},
auto: isLoggedIn ? true : false,
cache: ['learningPaths'],
url: 'lms.lms.api.is_learning_path_enabled',
auto: true,
cache: ['learningPath'],
})
const allowGuestAccess = createResource({
@@ -26,12 +20,6 @@ export const useSettings = defineStore('settings', () => {
cache: ['allowGuestAccess'],
})
/* const onboardingDetails = createResource({
url: 'lms.lms.utils.is_onboarding_complete',
auto: isLoggedIn ? true : false,
cache: ['onboardingDetails'],
}) */
return {
isSettingsOpen,
activeTab,

View File

@@ -14,6 +14,11 @@ import dayjs from '@/utils/dayjs'
import Embed from '@editorjs/embed'
import SimpleImage from '@editorjs/simple-image'
import Table from '@editorjs/table'
import { usersStore } from '../stores/user'
import Plyr from 'plyr'
import 'plyr/dist/plyr.css'
const readOnlyMode = window.read_only_mode
export function createToast(options) {
toast({
@@ -108,7 +113,7 @@ export function showToast(title, text, icon, iconClasses = null) {
icon: icon,
iconClasses: iconClasses,
position: icon == 'check' ? 'bottom-right' : 'top-center',
timeout: 5,
timeout: icon != 'check' ? 10 : 5,
})
}
@@ -198,78 +203,50 @@ export function getEditorTools() {
services: {
youtube: {
regex: /(?:https?:\/\/)?(?:www\.)?(?:(?:youtu\.be\/)|(?:youtube\.com)\/(?:v\/|u\/\w\/|embed\/|watch))(?:(?:\?v=)?([^#&?=]*))?((?:[?&]\w*=\w*)*)/,
embedUrl:
'https://www.youtube.com/embed/<%= remote_id %>',
html: '<iframe style="width:100%; height: 30rem;" frameborder="0" allowfullscreen></iframe>',
height: 320,
width: 580,
id: ([id, params]) => {
if (!params && id) {
return id
}
const paramsMap = {
start: 'start',
end: 'end',
t: 'start',
// eslint-disable-next-line camelcase
time_continue: 'start',
list: 'list',
}
let newParams = params
.slice(1)
.split('&')
.map((param) => {
const [name, value] = param.split('=')
if (!id && name === 'v') {
id = value
return null
}
if (!paramsMap[name]) {
return null
}
if (
value === 'LL' ||
value.startsWith('RDMM') ||
value.startsWith('FL')
) {
return null
}
return `${paramsMap[name]}=${value}`
})
.filter((param) => !!param)
return id + '?' + newParams.join('&')
},
embedUrl: '<%= remote_id %>',
/* 'https://www.youtube.com/embed/<%= remote_id %>?origin=https://plyr.io&amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1' */
html: `<div class="video-player" data-plyr-provider="youtube"></div>`,
id: ([id]) => id,
},
vimeo: {
regex: /(?:http[s]?:\/\/)?(?:www\.)?vimeo\.com\/(\d+)/,
embedUrl: '<%= remote_id %>',
html: `<div class="video-player" data-plyr-provider="vimeo"></div>`,
id: ([id]) => id,
},
cloudflareStream: {
regex: /https:\/\/customer-[a-z0-9]+\.cloudflarestream\.com\/([a-f0-9]{32})\/watch/,
embedUrl:
'https://iframe.videodelivery.net/<%= remote_id %>',
html: `<iframe style="width:100%; height: ${
window.innerWidth < 640 ? '15rem' : '30rem'
};" frameborder="0" allowfullscreen></iframe>`,
},
vimeo: true,
codepen: true,
aparat: {
regex: /(?:http[s]?:\/\/)?(?:www.)?aparat\.com\/v\/([^\/\?\&]+)\/?/,
embedUrl:
'https://www.aparat.com/video/video/embed/videohash/<%= remote_id %>/vt/frame',
html: '<iframe style="margin: 0 auto; width: 100%; height: 25rem;" frameborder="0" scrolling="no" allowtransparency="true"></iframe>',
height: 300,
width: 600,
html: `<iframe style="margin: 0 auto; width: 100%; height: ${
window.innerWidth < 640 ? '15rem' : '30rem'
};" frameborder="0" scrolling="no" allowtransparency="true"></iframe>`,
},
github: true,
slides: {
regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/pub/,
embedUrl:
'https://docs.google.com/presentation/d/<%= remote_id %>/embed',
html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0' frameborder='0' allowfullscreen='true'></iframe>",
html: `<iframe style='width: 100%; height: ${
window.innerWidth < 640 ? '15rem' : '30rem'
}; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0' frameborder='0' allowfullscreen='true'></iframe>`,
},
drive: {
regex: /https:\/\/drive\.google\.com\/file\/d\/([A-Za-z0-9_-]+)\/view(\?.+)?/,
embedUrl:
'https://drive.google.com/file/d/<%= remote_id %>/preview',
html: "<iframe style='width: 100%; height: 25rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
html: `<iframe style='width: 100%; height: ${
window.innerWidth < 640 ? '15rem' : '30rem'
}; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>`,
},
docsPublic: {
regex: /https:\/\/docs\.google\.com\/document\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/,
@@ -478,7 +455,7 @@ export function getSidebarLinks() {
activeFor: ['Batches', 'BatchDetail', 'Batch', 'BatchForm'],
},
{
label: 'Certified Participants',
label: 'Certified Members',
icon: 'GraduationCap',
to: 'CertifiedParticipants',
activeFor: ['CertifiedParticipants'],
@@ -567,3 +544,38 @@ export const escapeHTML = (text) => {
(char) => escape_html_mapping[char] || char
)
}
export const canCreateCourse = () => {
const { userResource } = usersStore()
return (
!readOnlyMode &&
(userResource.data?.is_instructor || userResource.data?.is_moderator)
)
}
export const enablePlyr = () => {
setTimeout(() => {
const videoElement = document.getElementsByClassName('video-player')
if (videoElement.length === 0) return
const src = videoElement[0].getAttribute('src')
if (src) {
let videoID = src.split('/').pop()
videoElement[0].setAttribute('data-plyr-embed-id', videoID)
}
new Plyr('.video-player', {
youtube: {
noCookie: true,
},
controls: [
'play-large',
'play',
'progress',
'current-time',
'mute',
'volume',
'fullscreen',
],
})
}, 500)
}

View File

@@ -25,7 +25,7 @@ export default defineConfig({
}),
],
server: {
allowedHosts: ['fs', 'onb1'],
allowedHosts: ['fs', 'persona'],
},
resolve: {
alias: {
@@ -40,6 +40,7 @@ export default defineConfig({
'engine.io-client',
'tailwind.config.js',
'highlight.js',
'plyr',
],
},
})

2812
frontend/yarn.lock Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1 @@
__version__ = "2.26.0"
__version__ = "2.28.0"

View File

@@ -246,7 +246,7 @@ on_login = "lms.lms.user.on_login"
add_to_apps_screen = [
{
"name": "lms",
"logo": "/assets/lms/images/lms-logo.png",
"logo": "/assets/lms/frontend/learning.svg",
"title": "Learning",
"route": "/lms",
"has_permission": "lms.lms.api.check_app_permission",

View File

@@ -9,18 +9,19 @@
"field_order": [
"job_title",
"location",
"disabled",
"country",
"column_break_5",
"type",
"status",
"disabled",
"section_break_6",
"description",
"company_details_section",
"company_name",
"company_website",
"column_break_11",
"column_break_phkm",
"company_logo",
"company_email_address"
"company_email_address",
"company_details_section",
"description"
],
"fields": [
{
@@ -36,7 +37,7 @@
"fieldtype": "Data",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Location",
"label": "City",
"reqd": 1
},
{
@@ -62,7 +63,8 @@
},
{
"fieldname": "section_break_6",
"fieldtype": "Section Break"
"fieldtype": "Section Break",
"label": "Company Details"
},
{
"fieldname": "description",
@@ -72,8 +74,7 @@
},
{
"fieldname": "company_details_section",
"fieldtype": "Section Break",
"label": "Company Details"
"fieldtype": "Section Break"
},
{
"fieldname": "company_name",
@@ -89,10 +90,6 @@
"label": "Company Website",
"reqd": 1
},
{
"fieldname": "column_break_11",
"fieldtype": "Column Break"
},
{
"fieldname": "company_logo",
"fieldtype": "Attach Image",
@@ -111,13 +108,30 @@
"label": "Company Email Address",
"options": "Email",
"reqd": 1
},
{
"fieldname": "column_break_phkm",
"fieldtype": "Column Break"
},
{
"fieldname": "country",
"fieldtype": "Link",
"label": "Country",
"options": "Country",
"reqd": 1
}
],
"grid_page_length": 50,
"index_web_pages_for_search": 1,
"links": [],
"links": [
{
"link_doctype": "LMS Job Application",
"link_fieldname": "job"
}
],
"make_attachments_public": 1,
"modified": "2025-01-17 12:38:57.134919",
"modified_by": "Administrator",
"modified": "2025-04-24 14:34:35.920242",
"modified_by": "sayali@frappe.io",
"module": "Job",
"name": "Job Opportunity",
"owner": "Administrator",
@@ -157,8 +171,9 @@
"write": 1
}
],
"row_format": "Dynamic",
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"title_field": "job_title"
}
}

View File

@@ -19,6 +19,8 @@ from frappe.utils import (
format_date,
date_diff,
)
from frappe.query_builder import DocType
from pypika.functions import DistinctOptionFunction
from lms.lms.utils import get_average_rating, get_lesson_count
from xml.dom.minidom import parseString
from lms.lms.doctype.course_lesson.course_lesson import save_progress
@@ -182,9 +184,10 @@ def get_user_info():
)
user.is_fc_site = is_fc_site()
user.is_system_manager = "System Manager" in user.roles
user.sitename = frappe.local.site
user.developer_mode = frappe.conf.developer_mode
if user.is_fc_site and user.is_system_manager:
user.site_info = current_site_info()
user.sitename = frappe.local.site
return user
@@ -237,6 +240,11 @@ def validate_billing_access(billing_type, name):
access = False
message = _("Batch is sold out.")
start_date = frappe.get_cached_value("LMS Batch", name, "start_date")
if start_date and date_diff(start_date, now()) < 0:
access = False
message = _("Batch has already started.")
elif access and billing_type == "certificate":
purchased_certificate = frappe.db.exists(
"LMS Enrollment",
@@ -278,9 +286,11 @@ def get_job_details(job):
[
"job_title",
"location",
"country",
"type",
"company_name",
"company_logo",
"company_website",
"name",
"creation",
"description",
@@ -302,14 +312,20 @@ def get_job_opportunities(filters=None, orFilters=None):
fields=[
"job_title",
"location",
"country",
"type",
"company_name",
"company_logo",
"name",
"creation",
"description",
],
order_by="creation desc",
)
for job in jobs:
job.description = frappe.utils.strip_html_tags(job.description)
job.applicants = frappe.db.count("LMS Job Application", {"job": job.name})
return jobs
@@ -330,7 +346,7 @@ def get_chart_details():
details.completions = frappe.db.count(
"LMS Enrollment", {"progress": ["like", "%100%"]}
)
details.lesson_completions = frappe.db.count("LMS Course Progress")
details.certifications = frappe.db.count("LMS Certificate", {"published": 1})
return details
@@ -410,29 +426,50 @@ def get_certified_participants(filters=None, start=0, page_length=30):
or_filters["course_title"] = ["like", f"%{category}%"]
or_filters["batch_title"] = ["like", f"%{category}%"]
participants = frappe.get_all(
participants = frappe.db.get_all(
"LMS Certificate",
filters=filters,
or_filters=or_filters,
fields=["member"],
fields=["member", "issue_date"],
group_by="member",
order_by="creation desc",
order_by="issue_date desc",
start=start,
page_length=page_length,
)
for participant in participants:
count = frappe.db.count("LMS Certificate", {"member": participant.member})
details = frappe.db.get_value(
"User",
participant.member,
["full_name", "user_image", "username", "country", "headline"],
as_dict=1,
)
details["certificate_count"] = count
participant.update(details)
return participants
class CountDistinct(DistinctOptionFunction):
def __init__(self, field):
super().__init__("COUNT", field, distinct=True)
@frappe.whitelist(allow_guest=True)
def get_count_of_certified_members():
Certificate = DocType("LMS Certificate")
query = (
frappe.qb.from_(Certificate)
.select(CountDistinct(Certificate.member).as_("total"))
.where(Certificate.published == 1)
)
result = query.run(as_dict=True)
return result[0]["total"] if result else 0
@frappe.whitelist(allow_guest=True)
def get_certification_categories():
categories = []
@@ -654,13 +691,13 @@ def get_categories(doctype, filters):
@frappe.whitelist()
def get_members(start=0, search=""):
"""Get members for the given search term and start index.
Args: start (int): Start index for the query.
Args: start (int): Start index for the query.
<<<<<<< HEAD
search (str): Search term to filter the results.
search (str): Search term to filter the results.
=======
search (str): Search term to filter the results.
search (str): Search term to filter the results.
>>>>>>> 4869bba7bbb2fb38477d6fc29fb3b5838e075577
Returns: List of members.
Returns: List of members.
"""
filters = {"enabled": 1, "name": ["not in", ["Administrator", "Guest"]]}
@@ -1258,6 +1295,11 @@ def is_guest_allowed():
return frappe.get_cached_value("LMS Settings", None, "allow_guest_access")
@frappe.whitelist(allow_guest=True)
def is_learning_path_enabled():
return frappe.get_cached_value("LMS Settings", None, "enable_learning_paths")
@frappe.whitelist()
def cancel_evaluation(evaluation):
evaluation = frappe._dict(evaluation)
@@ -1360,3 +1402,17 @@ def add_an_evaluator(email):
evaluator.insert()
return evaluator
@frappe.whitelist()
def capture_user_persona(responses):
frappe.only_for("System Manager")
data = frappe.parse_json(responses)
data = json.dumps(data)
response = frappe.integrations.utils.make_post_request(
"https://school.frappe.io/api/method/capture-persona",
data={"response": data},
)
if response.get("message").get("name"):
frappe.db.set_single_value("LMS Settings", "persona_captured", True)
return response

View File

@@ -0,0 +1,31 @@
{
"based_on": "issue_date",
"chart_name": "Certification",
"chart_type": "Count",
"creation": "2025-04-28 17:47:28.517149",
"docstatus": 0,
"doctype": "Dashboard Chart",
"document_type": "LMS Certificate",
"dynamic_filters_json": "[]",
"filters_json": "[[\"LMS Certificate\",\"published\",\"=\",1,false]]",
"group_by_type": "Count",
"idx": 0,
"is_public": 1,
"is_standard": 1,
"modified": "2025-04-28 17:47:28.517149",
"modified_by": "sayali@frappe.io",
"module": "LMS",
"name": "Certification",
"number_of_groups": 0,
"owner": "sayali@frappe.io",
"parent_document_type": "",
"roles": [],
"source": "",
"time_interval": "Daily",
"timeseries": 1,
"timespan": "Last Month",
"type": "Line",
"use_report_chart": 0,
"value_based_on": "",
"y_axis": []
}

View File

@@ -9,14 +9,14 @@
"doctype": "Dashboard Chart",
"document_type": "User",
"dynamic_filters_json": "[]",
"filters_json": "[]",
"filters_json": "[[\"User\",\"enabled\",\"=\",1,false]]",
"group_by_type": "Count",
"idx": 1,
"idx": 5,
"is_public": 1,
"is_standard": 1,
"last_synced_on": "2022-10-20 10:46:56.849265",
"modified": "2022-10-20 11:31:17.184897",
"modified_by": "Administrator",
"last_synced_on": "2025-04-28 15:09:52.161688",
"modified": "2025-04-28 17:47:58.168293",
"modified_by": "sayali@frappe.io",
"module": "LMS",
"name": "New Signups",
"number_of_groups": 0,
@@ -30,4 +30,4 @@
"use_report_chart": 0,
"value_based_on": "",
"y_axis": []
}
}

View File

@@ -161,7 +161,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2024-11-14 13:46:56.838659",
"modified": "2025-04-10 15:19:22.400932",
"modified_by": "Administrator",
"module": "LMS",
"name": "Course Lesson",
@@ -189,14 +189,28 @@
"print": 1,
"read": 1,
"report": 1,
"role": "LMS Student",
"role": "Course Creator",
"select": 1,
"share": 1,
"write": 1
},
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Moderator",
"select": 1,
"share": 1,
"write": 1
}
],
"row_format": "Dynamic",
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}

View File

@@ -11,66 +11,34 @@ import json
class CourseLesson(Document):
def validate(self):
# self.check_and_create_folder()
def on_update(self):
self.validate_quiz_id()
def validate_quiz_id(self):
if self.quiz_id and not frappe.db.exists("LMS Quiz", self.quiz_id):
frappe.throw(_("Invalid Quiz ID"))
def on_update(self):
dynamic_documents = ["Exercise", "Quiz"]
for section in dynamic_documents:
self.update_lesson_name_in_document(section)
if self.content:
self.save_lesson_details_in_quiz(self.content)
def update_lesson_name_in_document(self, section):
doctype_map = {"Exercise": "LMS Exercise", "Quiz": "LMS Quiz"}
macros = find_macros(self.body)
documents = [value for name, value in macros if name == section]
index = 1
for name in documents:
e = frappe.get_doc(doctype_map[section], name)
e.lesson = self.name
e.index_ = index
e.course = self.course
e.save(ignore_permissions=True)
index += 1
self.update_orphan_documents(doctype_map[section], documents)
if self.instructor_content:
self.save_lesson_details_in_quiz(self.instructor_content)
def update_orphan_documents(self, doctype, documents):
"""Updates the documents that were previously part of this lesson,
but not any more.
"""
linked_documents = {
row["name"] for row in frappe.get_all(doctype, {"lesson": self.name})
}
active_documents = set(documents)
orphan_documents = linked_documents - active_documents
for name in orphan_documents:
ex = frappe.get_doc(doctype, name)
ex.lesson = None
ex.course = None
ex.index_ = 0
ex.save(ignore_permissions=True)
def check_and_create_folder(self):
args = {
"doctype": "File",
"is_folder": True,
"file_name": f"{self.name} {self.course}",
}
if not frappe.db.exists(args):
folder = frappe.get_doc(args)
folder.save(ignore_permissions=True)
def get_exercises(self):
if not self.body:
return []
macros = find_macros(self.body)
exercises = [value for name, value in macros if name == "Exercise"]
return [frappe.get_doc("LMS Exercise", name) for name in exercises]
def save_lesson_details_in_quiz(self, content):
content = json.loads(self.content)
for block in content.get("blocks"):
if block.get("type") == "quiz":
quiz = block.get("data").get("quiz")
if not frappe.db.exists("LMS Quiz", quiz):
frappe.throw(_("Invalid Quiz ID in content"))
frappe.db.set_value(
"LMS Quiz",
quiz,
{
"course": self.course,
"lesson": self.name,
},
)
@frappe.whitelist()
@@ -102,7 +70,7 @@ def save_progress(lesson, course):
progress = get_course_progress(course)
capture_progress_for_analytics(progress, course)
# Had to get doc, as on_change doesn't trigger when you use set_value. The trigger is necesary for badge to get assigned.
# Had to get doc, as on_change doesn't trigger when you use set_value. The trigger is necessary for badge to get assigned.
enrollment = frappe.get_doc("LMS Enrollment", membership)
enrollment.progress = progress
enrollment.save()

View File

@@ -4,8 +4,7 @@
import frappe
from frappe import _
from frappe.model.document import Document
from frappe.utils import validate_url, validate_email_address
from frappe.email.doctype.email_template.email_template import get_email_template
from frappe.utils import validate_url
from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
@@ -15,14 +14,6 @@ class LMSAssignmentSubmission(Document):
self.validate_url()
self.validate_status()
def after_insert(self):
if not frappe.flags.in_test:
outgoing_email_account = frappe.get_cached_value(
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
)
if outgoing_email_account or frappe.conf.get("mail_login"):
self.send_mail()
def validate_duplicates(self):
if frappe.db.exists(
"LMS Assignment Submission",
@@ -39,38 +30,6 @@ class LMSAssignmentSubmission(Document):
if self.type == "URL" and not validate_url(self.answer):
frappe.throw(_("Please enter a valid URL."))
def send_mail(self):
subject = _("New Assignment Submission")
template = "assignment_submission"
custom_template = frappe.db.get_single_value(
"LMS Settings", "assignment_submission_template"
)
args = {
"member_name": self.member_name,
"assignment_name": self.assignment,
"assignment_title": self.assignment_title,
"submission_name": self.name,
}
moderators = frappe.get_all("Has Role", {"role": "Moderator"}, pluck="parent")
for moderator in moderators:
if not validate_email_address(moderator):
moderators.remove(moderator)
if custom_template:
email_template = get_email_template(custom_template, args)
subject = email_template.get("subject")
content = email_template.get("message")
frappe.sendmail(
recipients=moderators,
subject=subject,
template=template if not custom_template else None,
content=content if custom_template else None,
args=args,
header=[subject, "green"],
)
def validate_status(self):
if not self.is_new():
doc_before_save = self.get_doc_before_save()

View File

@@ -53,7 +53,12 @@ class LMSBatch(Document):
if self.paid_batch:
installed_apps = frappe.get_installed_apps()
if "payments" not in installed_apps:
frappe.throw(_("Please install the Payments app to create a paid batches."))
documentation_link = "https://docs.frappe.io/learning/setting-up-payment-gateway"
frappe.throw(
_(
"Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
).format(documentation_link)
)
def validate_amount_and_currency(self):
if self.paid_batch and (not self.amount or not self.currency):

View File

@@ -50,7 +50,12 @@ class LMSCourse(Document):
if self.paid_course:
installed_apps = frappe.get_installed_apps()
if "payments" not in installed_apps:
frappe.throw(_("Please install the Payments app to create a paid courses."))
documentation_link = "https://docs.frappe.io/learning/setting-up-payment-gateway"
frappe.throw(
_(
"Please install the Payments App to create a paid course. Refer to the documentation for more details. {0}"
).format(documentation_link)
)
def validate_certification(self):
if self.enable_certification and self.paid_certificate:

View File

@@ -91,7 +91,7 @@
"fetch_from": "member.username",
"fieldname": "member_username",
"fieldtype": "Data",
"label": "Memeber Username",
"label": "Member Username",
"read_only": 1
},
{
@@ -145,10 +145,11 @@
"options": "LMS Certificate"
}
],
"grid_page_length": 50,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2025-02-21 17:11:37.986157",
"modified_by": "Administrator",
"modified": "2025-04-25 10:06:25.824119",
"modified_by": "sayali@frappe.io",
"module": "LMS",
"name": "LMS Enrollment",
"owner": "Administrator",
@@ -192,10 +193,11 @@
}
],
"quick_entry": 1,
"row_format": "Dynamic",
"show_title_field_in_link": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"title_field": "member_name",
"track_changes": 1
}
}

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