From 7ed5dfdb8f4681a8341cbd4db2511463ab129bf2 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 21 Apr 2025 16:34:34 +0530 Subject: [PATCH 1/3] fix: allow fullscreen on video and adjust video height on mobile devices --- frappe-ui | 2 +- frontend/src/components/CourseCard.vue | 14 +++++++----- frontend/src/pages/CourseDetail.vue | 2 +- frontend/src/utils/index.js | 30 ++++++++++++++++++-------- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/frappe-ui b/frappe-ui index 29307e4f..8cd9b06a 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 29307e4fffaacdbb3d9c5d95c5270b2f245a5607 +Subproject commit 8cd9b06a5ed50dc181d9672b2fe84c1594b52b48 diff --git a/frontend/src/components/CourseCard.vue b/frontend/src/components/CourseCard.vue index d26f5130..98093808 100644 --- a/frontend/src/components/CourseCard.vue +++ b/frontend/src/components/CourseCard.vue @@ -9,16 +9,20 @@ :class="{ 'default-image': !course.image }" :style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }" > -
- +
+ {{ __('Featured') }}
{{ tag }}
diff --git a/frontend/src/pages/CourseDetail.vue b/frontend/src/pages/CourseDetail.vue index 561c9362..eaa9d7ac 100644 --- a/frontend/src/pages/CourseDetail.vue +++ b/frontend/src/pages/CourseDetail.vue @@ -56,7 +56,7 @@
-
+
', - html: '', - height: 320, - width: 580, + html: ``, id: ([id, params]) => { if (!params && id) { return id @@ -249,28 +249,40 @@ export function getEditorTools() { return id + '?' + newParams.join('&') }, }, - vimeo: true, + vimeo: { + regex: /(?:http[s]?:\/\/)?(?:www\.)?vimeo\.com\/(\d+)/, + embedUrl: + 'https://player.vimeo.com/video/<%= remote_id %>', + html: ``, + id: ([id]) => id, + }, codepen: true, aparat: { regex: /(?:http[s]?:\/\/)?(?:www.)?aparat\.com\/v\/([^\/\?\&]+)\/?/, embedUrl: 'https://www.aparat.com/video/video/embed/videohash/<%= remote_id %>/vt/frame', - html: '', - height: 300, - width: 600, + html: ``, }, github: true, slides: { regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/pub/, embedUrl: 'https://docs.google.com/presentation/d/<%= remote_id %>/embed', - html: "", + html: ``, }, drive: { regex: /https:\/\/drive\.google\.com\/file\/d\/([A-Za-z0-9_-]+)\/view(\?.+)?/, embedUrl: 'https://drive.google.com/file/d/<%= remote_id %>/preview', - html: "", + html: ``, }, docsPublic: { regex: /https:\/\/docs\.google\.com\/document\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/, From 89fdbf56606dbac8a68114f0bdf6785385ec3fb8 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 21 Apr 2025 17:10:33 +0530 Subject: [PATCH 2/3] test: find the course image label and attach course image to its sibling input --- cypress/e2e/course_creation.cy.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js index 7d20fdcb..28b97041 100644 --- a/cypress/e2e/course_creation.cy.js +++ b/cypress/e2e/course_creation.cy.js @@ -19,12 +19,16 @@ describe("Course Creation", () => { ); cy.fixture("profile.png", "base64").then((fileContent) => { - cy.get('input[type="file"]').attachFile({ - fileContent, - fileName: "profile.png", - mimeType: "image/png", - encoding: "base64", - }); + cy.get("div") + .contains("Course Image") + .siblings("div") + .children('input[type="file"]') + .attachFile({ + fileContent, + fileName: "profile.png", + mimeType: "image/png", + encoding: "base64", + }); }); cy.get("label") From 21708191597db2ad195ad05e938e07d17223c4bf Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 26 May 2025 22:02:46 +0530 Subject: [PATCH 3/3] chore: telemetry fixes --- frappe-ui | 2 +- frontend/src/App.vue | 11 ++++++++++- frontend/src/telemetry.ts | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frappe-ui b/frappe-ui index 175be05a..fd525266 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 175be05a921b44560114ae9af07015a761b669a2 +Subproject commit fd5252663b9dc82edcf083323ce2b5c4cb63782f diff --git a/frontend/src/App.vue b/frontend/src/App.vue index e13f2078..a8398d21 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -9,16 +9,19 @@ diff --git a/frontend/src/telemetry.ts b/frontend/src/telemetry.ts index 12b23494..cd39ecd3 100644 --- a/frontend/src/telemetry.ts +++ b/frontend/src/telemetry.ts @@ -6,12 +6,14 @@ declare global { posthog: any } } + type PosthogSettings = { posthog_project_id: string posthog_host: string enable_telemetry: boolean telemetry_site_age: number } + interface CaptureOptions { data: { user: string