diff --git a/cypress.config.js b/cypress.config.js index 9d710bc1..5e1c68ea 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -13,6 +13,6 @@ module.exports = defineConfig({ openMode: 0, }, e2e: { - baseUrl: "http://lms1:8000", + baseUrl: "http://testui:8000", }, }); diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js index 8ff62758..7d20fdcb 100644 --- a/cypress/e2e/course_creation.cy.js +++ b/cypress/e2e/course_creation.cy.js @@ -5,7 +5,7 @@ describe("Course Creation", () => { cy.visit("/lms/courses"); // Create a course - cy.get("header").children().last().children().last().click(); + cy.get("button").contains("New").click(); cy.wait(1000); cy.url().should("include", "/courses/new/edit"); @@ -84,9 +84,8 @@ describe("Course Creation", () => { cy.wait(1000); cy.get("label").contains("Title").type("Test Lesson"); - 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." + "{enter}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." ); cy.button("Save").click(); diff --git a/frontend/package.json b/frontend/package.json index 18cb4a51..a8482f7c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,6 +19,7 @@ "@editorjs/paragraph": "^2.11.3", "@editorjs/simple-image": "^1.6.0", "@editorjs/table": "^2.4.2", + "@vueuse/router": "^12.7.0", "ace-builds": "^1.36.2", "apexcharts": "^4.3.0", "chart.js": "^4.4.1", diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue index be4f7a75..cf684993 100644 --- a/frontend/src/components/BatchOverlay.vue +++ b/frontend/src/components/BatchOverlay.vue @@ -69,7 +69,11 @@ name: batch.data.name, }, }" - v-else-if="batch.data.paid_batch && batch.data.seats_left" + v-else-if=" + batch.data.paid_batch && + batch.data.seats_left > 0 && + batch.data.accept_enrollments + " > - +
+ + + + +
+ + + {{ __('Certificate of Completion') }} + + +
+ + + {{ __('Paid Certificate after Evaluation') }} + +
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue index 3382e370..26ae36a0 100644 --- a/frontend/src/pages/Batch.vue +++ b/frontend/src/pages/Batch.vue @@ -6,7 +6,7 @@