Skip to content

Commit 95f37f7

Browse files
pateljannatpateljannat
authored
Merge pull request #1882 from frappe/develop
chore: merge 'develop' into 'main'
2 parents 651300b + 87a7b93 commit 95f37f7

37 files changed

Lines changed: 3291 additions & 1563 deletions

‎frontend/package.json‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,55 @@
1010
"copy-html-entry": "cp ../lms/public/frontend/index.html ../lms/www/lms.html"
1111
},
1212
"dependencies": {
13-
"@codemirror/lang-html": "^6.4.9",
14-
"@codemirror/lang-javascript": "^6.2.4",
15-
"@codemirror/lang-json": "^6.0.1",
16-
"@codemirror/lang-python": "^6.2.1",
17-
"@editorjs/checklist": "^1.6.0",
18-
"@editorjs/code": "^2.9.0",
19-
"@editorjs/editorjs": "^2.29.0",
13+
"@codemirror/lang-html": "6.4.9",
14+
"@codemirror/lang-javascript": "6.2.4",
15+
"@codemirror/lang-json": "6.0.1",
16+
"@codemirror/lang-python": "6.2.1",
17+
"@editorjs/checklist": "1.6.0",
18+
"@editorjs/code": "2.9.0",
19+
"@editorjs/editorjs": "2.29.0",
2020
"@editorjs/embed": "2.7.0",
21-
"@editorjs/header": "^2.8.1",
22-
"@editorjs/inline-code": "^1.5.0",
23-
"@editorjs/nested-list": "^1.4.2",
24-
"@editorjs/paragraph": "^2.11.3",
25-
"@editorjs/simple-image": "^1.6.0",
26-
"@editorjs/table": "^2.4.2",
27-
"@vueuse/core": "^10.4.1",
28-
"@vueuse/router": "^12.7.0",
29-
"ace-builds": "^1.36.2",
30-
"apexcharts": "^4.3.0",
31-
"chart.js": "^4.4.1",
32-
"codemirror": "^6.0.1",
33-
"dayjs": "^1.11.6",
34-
"dompurify": "^3.2.6",
35-
"feather-icons": "^4.28.0",
36-
"frappe-ui": "^0.1.227",
37-
"highlight.js": "^11.11.1",
38-
"lucide-vue-next": "^0.383.0",
39-
"markdown-it": "^14.0.0",
40-
"pinia": "^2.0.33",
41-
"plyr": "^3.7.8",
42-
"socket.io-client": "^4.7.2",
21+
"@editorjs/header": "2.8.1",
22+
"@editorjs/inline-code": "1.5.0",
23+
"@editorjs/nested-list": "1.4.2",
24+
"@editorjs/paragraph": "2.11.3",
25+
"@editorjs/simple-image": "1.6.0",
26+
"@editorjs/table": "2.4.2",
27+
"@vueuse/core": "10.4.1",
28+
"@vueuse/router": "12.7.0",
29+
"ace-builds": "1.36.2",
30+
"apexcharts": "4.3.0",
31+
"chart.js": "4.4.1",
32+
"codemirror": "6.0.1",
33+
"dayjs": "1.11.10",
34+
"dompurify": "3.2.6",
35+
"feather-icons": "4.28.0",
36+
"frappe-ui": "0.1.227",
37+
"highlight.js": "11.11.1",
38+
"lucide-vue-next": "0.383.0",
39+
"markdown-it": "14.0.0",
40+
"pinia": "2.0.33",
41+
"plyr": "3.7.8",
42+
"socket.io-client": "4.7.2",
4343
"tailwindcss": "3.4.15",
44-
"thememirror": "^2.0.1",
45-
"typescript": "^5.7.2",
46-
"vue": "^3.4.23",
47-
"vue-chartjs": "^5.3.0",
48-
"vue-codemirror": "^6.1.1",
49-
"vue-draggable-next": "^2.2.1",
50-
"vue-router": "^4.0.12",
51-
"vue3-apexcharts": "^1.8.0",
44+
"thememirror": "2.0.1",
45+
"typescript": "5.7.2",
46+
"vue": "^3.5.0",
47+
"vue-chartjs": "5.3.0",
48+
"vue-codemirror": "6.1.1",
49+
"vue-draggable-next": "2.2.1",
50+
"vue-router": "4.2.2",
51+
"vue3-apexcharts": "1.8.0",
5252
"vuedraggable": "4.1.0"
5353
},
5454
"devDependencies": {
55-
"@vitejs/plugin-vue": "^5.0.3",
56-
"autoprefixer": "^10.4.2",
57-
"postcss": "^8.4.5",
58-
"vite": "^5.0.11",
55+
"@vitejs/plugin-vue": "5.0.3",
56+
"autoprefixer": "10.4.2",
57+
"postcss": "8.4.5",
58+
"vite": "5.0.11",
5959
"vite-plugin-pwa": "0.15.0"
60+
},
61+
"resolutions": {
62+
"@iconify/utils": "2.1.7"
6063
}
6164
}

‎frontend/src/components/Assignment.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@
179179
"
180180
:editable="true"
181181
:fixedMenu="true"
182+
:uploadArgs="{
183+
private: true,
184+
}"
182185
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
183186
/>
184187
</div>

‎frontend/src/components/Controls/IconPicker.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class="w-4 h-4 text-ink-gray-7 stroke-1.5"
2121
:is="icons.Folder"
2222
/>
23-
<span v-if="selectedIcon">
23+
<span v-if="selectedIcon" class="text-ink-gray-7">
2424
{{ selectedIcon }}
2525
</span>
2626
<span v-else class="text-ink-gray-5">

‎frontend/src/components/Modals/EvaluationModal.vue‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,18 @@
6666
</Dialog>
6767
</template>
6868
<script setup>
69-
import { Dialog, createResource, Select, FormControl, toast } from 'frappe-ui'
69+
import {
70+
dayjs,
71+
Dialog,
72+
createResource,
73+
Select,
74+
FormControl,
75+
toast,
76+
} from 'frappe-ui'
7077
import { reactive, watch, inject } from 'vue'
7178
import { formatTime } from '@/utils/'
7279
7380
const user = inject('$user')
74-
const dayjs = inject('$dayjs')
7581
const show = defineModel()
7682
const evaluations = defineModel('reloadEvals')
7783

‎frontend/src/components/Modals/PageModal.vue‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<template>
22
<Dialog
33
v-model="show"
4-
class="text-base"
54
:options="{
65
title: __('Add web page to sidebar'),
76
size: 'lg',
@@ -17,15 +16,17 @@
1716
}"
1817
>
1918
<template #body-content>
20-
<Link
21-
v-model="page.webpage"
22-
doctype="Web Page"
23-
:label="__('Web Page')"
24-
:filters="{
25-
published: 1,
26-
}"
27-
/>
28-
<IconPicker v-model="page.icon" :label="__('Icon')" class="mt-4" />
19+
<div class="text-base">
20+
<Link
21+
v-model="page.webpage"
22+
doctype="Web Page"
23+
:label="__('Web Page')"
24+
:filters="{
25+
published: 1,
26+
}"
27+
/>
28+
<IconPicker v-model="page.icon" :label="__('Icon')" class="mt-4" />
29+
</div>
2930
</template>
3031
</Dialog>
3132
</template>

‎frontend/src/components/Notes/Notes.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
:placeholder="__('Make notes for quick revision. Press / for menu.')"
88
@change="(val: string) => updateNoteText(val)"
99
:editable="true"
10+
:uploadArgs="{
11+
private: true,
12+
}"
1013
editorClass="prose prose-sm min-h-[200px] max-w-none"
1114
/>
1215
</template>

‎frontend/src/components/Sidebar/AppSidebar.vue‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ import { usersStore } from '@/stores/user'
189189
import { sessionStore } from '@/stores/session'
190190
import { useSidebar } from '@/stores/sidebar'
191191
import { useSettings } from '@/stores/settings'
192-
import { Button, call, createResource, Tooltip } from 'frappe-ui'
192+
import { Button, call, createResource, Tooltip, toast } from 'frappe-ui'
193193
import PageModal from '@/components/Modals/PageModal.vue'
194194
import { capture } from '@/telemetry'
195195
import LMSLogo from '@/components/Icons/LMSLogo.vue'
@@ -437,21 +437,13 @@ const openPageModal = (link) => {
437437
}
438438
439439
const deletePage = (link) => {
440-
createResource({
441-
url: 'lms.lms.api.delete_sidebar_item',
442-
makeParams(values) {
443-
return {
444-
webpage: link.web_page,
445-
}
446-
},
447-
}).submit(
448-
{},
449-
{
450-
onSuccess() {
451-
sidebarSettings.reload()
452-
},
453-
}
454-
)
440+
call('lms.lms.api.delete_documents', {
441+
doctype: 'LMS Sidebar Item',
442+
documents: [link.name],
443+
}).then(() => {
444+
sidebarSettings.reload()
445+
toast.success(__('Page deleted successfully'))
446+
})
455447
}
456448
457449
const toggleSidebar = () => {

‎frontend/src/utils/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ export const getMetaInfo = (type, route, meta) => {
675675

676676
export const updateMetaInfo = (type, route, meta) => {
677677
call('lms.lms.api.update_meta_info', {
678-
type: type,
678+
meta_type: type,
679679
route: route,
680680
meta_tags: [
681681
{ key: 'description', value: meta.description },

0 commit comments

Comments
 (0)