diff --git a/.gitmodules b/.gitmodules index e82154a1..aac084b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "frappe-ui"] path = frappe-ui - url = https://github.com/pateljannat/frappe-ui + url = https://github.com/frappe/frappe-ui diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js index e453ea5b..3e28b0a5 100644 --- a/cypress/e2e/course_creation.cy.js +++ b/cypress/e2e/course_creation.cy.js @@ -61,21 +61,7 @@ describe("Course Creation", () => { cy.wait(1000); cy.get("label").contains("Title").type("Test Lesson"); - /* cy.get("#content .ce-block") - .click() - .invoke("text", "https://www.youtube.com/watch?v=GoDtyItReto"); */ - /* cy.get("#content .ce-block") - .click() - .paste("https://www.youtube.com/watch?v=GoDtyItReto"); */ - cy.fixture("Youtube.mov", "base64").then((fileContent) => { - cy.get('input[type="file"]').attachFile({ - fileContent, - fileName: "Youtube.mov", - mimeType: "image/png", - encoding: "base64", - }); - }); cy.get("#content .ce-block").type( "This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now." ); @@ -119,12 +105,6 @@ describe("Course Creation", () => { cy.url().should("include", "/learn/1-1"); cy.get("div").contains("Test Lesson"); - cy.get("video") - .should("be.visible") - .children("source") - .invoke("attr", "src") - .should("include", "/files/Youtube"); - cy.get("div").contains( "This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now." ); diff --git a/frappe-ui b/frappe-ui new file mode 160000 index 00000000..8cd9b06a --- /dev/null +++ b/frappe-ui @@ -0,0 +1 @@ +Subproject commit 8cd9b06a5ed50dc181d9672b2fe84c1594b52b48 diff --git a/frontend/package.json b/frontend/package.json index 7935452a..5cf5af51 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -21,7 +21,7 @@ "chart.js": "^4.4.1", "dayjs": "^1.11.6", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.56", + "frappe-ui": "^0.1.69", "lucide-vue-next": "^0.383.0", "markdown-it": "^14.0.0", "pinia": "^2.0.33", diff --git a/frontend/public/Quiz.mp4 b/frontend/public/Quiz.mp4 new file mode 100644 index 00000000..7046b163 Binary files /dev/null and b/frontend/public/Quiz.mp4 differ diff --git a/frontend/public/Upload.mp4 b/frontend/public/Upload.mp4 new file mode 100644 index 00000000..d3d106d9 Binary files /dev/null and b/frontend/public/Upload.mp4 differ diff --git a/frontend/public/Youtube.mov b/frontend/public/Youtube.mov deleted file mode 100644 index ca6b75a2..00000000 Binary files a/frontend/public/Youtube.mov and /dev/null differ diff --git a/frontend/public/Youtube.mp4 b/frontend/public/Youtube.mp4 new file mode 100644 index 00000000..d03cf7ce Binary files /dev/null and b/frontend/public/Youtube.mp4 differ diff --git a/frontend/src/components/Assessments.vue b/frontend/src/components/Assessments.vue index 86798c99..bfe429e6 100644 --- a/frontend/src/components/Assessments.vue +++ b/frontend/src/components/Assessments.vue @@ -1,7 +1,15 @@ diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue index dc73322f..496a10ec 100644 --- a/frontend/src/components/BatchStudents.vue +++ b/frontend/src/components/BatchStudents.vue @@ -1,9 +1,9 @@ diff --git a/frontend/src/components/Modals/Event.vue b/frontend/src/components/Modals/Event.vue new file mode 100644 index 00000000..3e0534cd --- /dev/null +++ b/frontend/src/components/Modals/Event.vue @@ -0,0 +1,378 @@ +