From 0d41a1ae703934d26cfdc3687c334ec2e23f6cff Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 12 May 2025 10:37:26 +0530 Subject: [PATCH 01/48] refactor: use frappe-ui for batch progress charts --- frontend/package.json | 3 +- frontend/postcss.config.js | 2 +- frontend/src/components/BatchStudents.vue | 168 +- frontend/tailwind.config.js | 6 +- frontend/yarn.lock | 2812 --------------------- package.json | 3 +- yarn.lock | 814 +++--- 7 files changed, 548 insertions(+), 3260 deletions(-) delete mode 100644 frontend/yarn.lock diff --git a/frontend/package.json b/frontend/package.json index e5f71227..50f57d68 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -2,6 +2,7 @@ "name": "frappe-ui-frontend", "private": true, "version": "0.0.0", + "type": "module", "scripts": { "dev": "vite", "serve": "vite preview", @@ -26,7 +27,7 @@ "codemirror-editor-vue3": "^2.8.0", "dayjs": "^1.11.6", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.134", + "frappe-ui": "^0.1.141", "highlight.js": "^11.11.1", "lucide-vue-next": "^0.383.0", "markdown-it": "^14.0.0", diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js index 1b69d43b..1a526247 100644 --- a/frontend/postcss.config.js +++ b/frontend/postcss.config.js @@ -1,4 +1,4 @@ -module.exports = { +export default { plugins: { tailwindcss: {}, autoprefixer: {}, diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue index 2cc1bc21..d122448e 100644 --- a/frontend/src/components/BatchStudents.vue +++ b/frontend/src/components/BatchStudents.vue @@ -6,70 +6,100 @@
-
-
- -
-
- - {{ students.data?.length }} - - - {{ __('Students') }} - -
-
-
-
- -
-
- - {{ certificationCount.data }} - - - {{ __('Certified') }} - -
-
+ -
-
- -
-
- - {{ batch.courses?.length }} - - - {{ __('Courses') }} - -
-
+ -
-
- -
-
- - {{ assessmentCount }} - - - {{ __('Assessments') }} - -
-
+ + +
+ + +
{{ __('Progress') }} @@ -213,6 +243,7 @@ - From 3db11b93723decebf2f5578de8afce20726d5dae Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 21 May 2025 16:08:49 +0530 Subject: [PATCH 25/48] refactor: moved batch feedback to sidebar --- frontend/components.d.ts | 1 + frontend/src/components/BatchFeedback.vue | 172 +++++------------- .../src/components/Modals/FeedbackModal.vue | 115 ++++++++++++ frontend/src/pages/Batch.vue | 97 +++++----- frontend/src/pages/Batches.vue | 12 -- frontend/src/pages/Courses.vue | 4 +- lms/lms/doctype/lms_batch/lms_batch.json | 17 +- .../lms_batch_feedback.json | 11 +- 8 files changed, 238 insertions(+), 191 deletions(-) create mode 100644 frontend/src/components/Modals/FeedbackModal.vue diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 7bdb98c6..ec2677b1 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -52,6 +52,7 @@ declare module 'vue' { Evaluators: typeof import('./src/components/Evaluators.vue')['default'] Event: typeof import('./src/components/Modals/Event.vue')['default'] ExplanationVideos: typeof import('./src/components/Modals/ExplanationVideos.vue')['default'] + FeedbackModal: typeof import('./src/components/Modals/FeedbackModal.vue')['default'] FrappeCloudIcon: typeof import('./src/components/Icons/FrappeCloudIcon.vue')['default'] IconPicker: typeof import('./src/components/Controls/IconPicker.vue')['default'] IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default'] diff --git a/frontend/src/components/BatchFeedback.vue b/frontend/src/components/BatchFeedback.vue index 0ea90014..1ee5a7f3 100644 --- a/frontend/src/components/BatchFeedback.vue +++ b/frontend/src/components/BatchFeedback.vue @@ -1,44 +1,49 @@