diff --git a/cypress/e2e/batch_creation.cy.js b/cypress/e2e/batch_creation.cy.js index 8b1f05c6..9ec55c2c 100644 --- a/cypress/e2e/batch_creation.cy.js +++ b/cypress/e2e/batch_creation.cy.js @@ -10,11 +10,11 @@ describe("Batch Creation", () => { cy.get("span").contains("Settings").click(); // Add a new member - cy.get('[id^="headlessui-dialog-panel-v-"]') + cy.get("[data-dismissable-layer]") .find("span") .contains(/^Members$/) .click(); - cy.get('[id^="headlessui-dialog-panel-v-"]') + cy.get("[data-dismissable-layer]") .find("button") .contains("New") .click(); @@ -28,12 +28,12 @@ describe("Batch Creation", () => { cy.get("button").contains("Add").click(); // Add evaluator - cy.get('[id^="headlessui-dialog-panel-v-"]') + cy.get("[data-dismissable-layer]") .find("span") .contains(/^Evaluators$/) .click(); - cy.get('[id^="headlessui-dialog-panel-v-"]') + cy.get("[data-dismissable-layer]") .find("button") .contains("New") .click(); @@ -156,11 +156,7 @@ describe("Batch Creation", () => { /* Add student to batch */ cy.get("button").contains("Add").click(); - cy.get('div[id^="headlessui-dialog-panel-v-"]') - .first() - .find("button") - .eq(1) - .click(); + cy.get('div[role="dialog"]').first().find("button").eq(1).click(); cy.get("input[id^='headlessui-combobox-input-v-']").type(randomEmail); cy.get("div").contains(randomEmail).click(); cy.get("button").contains("Submit").click(); diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js index f50acd03..a0d14591 100644 --- a/cypress/e2e/course_creation.cy.js +++ b/cypress/e2e/course_creation.cy.js @@ -76,7 +76,7 @@ describe("Course Creation", () => { cy.button("Add Chapter").click(); cy.wait(1000); - cy.get("[id^=headlessui-dialog-panel-") + cy.get("[data-dismissable-layer]") .should("be.visible") .within(() => { cy.get("label").contains("Title").type("Test Chapter"); @@ -143,7 +143,7 @@ describe("Course Creation", () => { cy.get("span").contains("Community").click(); cy.button("New Question").click(); cy.wait(500); - cy.get("[id^=headlessui-dialog-panel-").within(() => { + cy.get("[data-dismissable-layer]").within(() => { cy.get("label").contains("Title").type("Test Discussion"); cy.get("div[contenteditable=true]").invoke( "text", diff --git a/frappe-ui b/frappe-ui index 8cd9b06a..c9a0fc93 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 8cd9b06a5ed50dc181d9672b2fe84c1594b52b48 +Subproject commit c9a0fc937cc897864857271b3708a0c675379015 diff --git a/frontend/components.d.ts b/frontend/components.d.ts index da4d9294..b9411e86 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -10,6 +10,7 @@ declare module 'vue' { export interface GlobalComponents { Annoucements: typeof import('./src/components/Annoucements.vue')['default'] AnnouncementModal: typeof import('./src/components/Modals/AnnouncementModal.vue')['default'] + AppHeader: typeof import('./src/components/AppHeader.vue')['default'] Apps: typeof import('./src/components/Apps.vue')['default'] AppSidebar: typeof import('./src/components/AppSidebar.vue')['default'] AssessmentModal: typeof import('./src/components/Modals/AssessmentModal.vue')['default'] @@ -71,6 +72,7 @@ declare module 'vue' { InviteIcon: typeof import('./src/components/Icons/InviteIcon.vue')['default'] JobApplicationModal: typeof import('./src/components/Modals/JobApplicationModal.vue')['default'] JobCard: typeof import('./src/components/JobCard.vue')['default'] + LayoutHeader: typeof import('./src/components/LayoutHeader.vue')['default'] LessonContent: typeof import('./src/components/LessonContent.vue')['default'] LessonHelp: typeof import('./src/components/LessonHelp.vue')['default'] Link: typeof import('./src/components/Controls/Link.vue')['default'] diff --git a/frontend/index.html b/frontend/index.html index bbf2ec7c..d910e2c8 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -213,7 +213,7 @@ - +

{{ meta.title }}

diff --git a/frontend/package.json b/frontend/package.json index d4b70441..38c695c4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,7 +32,7 @@ "dayjs": "^1.11.6", "dompurify": "^3.2.6", "feather-icons": "^4.28.0", - "frappe-ui": "0.1.173", + "frappe-ui": "^0.1.200", "highlight.js": "^11.11.1", "lucide-vue-next": "^0.383.0", "markdown-it": "^14.0.0", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 2e5c54ee..de252f78 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,9 +1,7 @@