diff --git a/.github/workflows/make_release_pr.yml b/.github/workflows/make_release_pr.yml index b8064ea2..8530727f 100644 --- a/.github/workflows/make_release_pr.yml +++ b/.github/workflows/make_release_pr.yml @@ -1,8 +1,7 @@ name: Create weekly release on: schedule: - # 13:00 UTC -> 7pm IST on every Wednesday - - cron: '30 4 * * 3' + - cron: '30 4 15 * *' workflow_dispatch: jobs: diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 5338837c..f4b87366 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -100,6 +100,7 @@ jobs: bench --site lms.test execute frappe.utils.install.complete_setup_wizard bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user bench --site lms.test set-password frappe@example.com admin + bench --site lms.test execute lms.lms.utils.persona_captured - name: cypress pre-requisites run: | diff --git a/cypress.config.js b/cypress.config.js index 5e1c68ea..c7c1354e 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -13,6 +13,6 @@ module.exports = defineConfig({ openMode: 0, }, e2e: { - baseUrl: "http://testui:8000", + baseUrl: "http://pertest:8000", }, }); diff --git a/frappe-ui b/frappe-ui index 8cd9b06a..175be05a 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 8cd9b06a5ed50dc181d9672b2fe84c1594b52b48 +Subproject commit 175be05a921b44560114ae9af07015a761b669a2 diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 93deddcf..7b544e12 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -16,6 +16,7 @@ declare module 'vue' { AssessmentPlugin: typeof import('./src/components/AssessmentPlugin.vue')['default'] Assessments: typeof import('./src/components/Assessments.vue')['default'] Assignment: typeof import('./src/components/Assignment.vue')['default'] + AssignmentForm: typeof import('./src/components/Modals/AssignmentForm.vue')['default'] AudioBlock: typeof import('./src/components/AudioBlock.vue')['default'] Autocomplete: typeof import('./src/components/Controls/Autocomplete.vue')['default'] BatchCard: typeof import('./src/components/BatchCard.vue')['default'] @@ -70,6 +71,7 @@ declare module 'vue' { NotPermitted: typeof import('./src/components/NotPermitted.vue')['default'] PageModal: typeof import('./src/components/Modals/PageModal.vue')['default'] PaymentSettings: typeof import('./src/components/PaymentSettings.vue')['default'] + Play: typeof import('./src/components/Icons/Play.vue')['default'] ProgressBar: typeof import('./src/components/ProgressBar.vue')['default'] Question: typeof import('./src/components/Modals/Question.vue')['default'] Quiz: typeof import('./src/components/Quiz.vue')['default'] diff --git a/frontend/index.html b/frontend/index.html index 8150b401..213e8807 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -26,12 +26,8 @@ Know More -
-
- diff --git a/frontend/package.json b/frontend/package.json index 7990f221..e5f71227 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,11 +26,12 @@ "codemirror-editor-vue3": "^2.8.0", "dayjs": "^1.11.6", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.122", + "frappe-ui": "^0.1.134", "highlight.js": "^11.11.1", "lucide-vue-next": "^0.383.0", "markdown-it": "^14.0.0", "pinia": "^2.0.33", + "plyr": "^3.7.8", "socket.io-client": "^4.7.2", "tailwindcss": "3.4.15", "typescript": "^5.7.2", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index d890f55a..c79397af 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -24,7 +24,7 @@ const router = useRouter() const noSidebar = ref(false) router.beforeEach((to, from, next) => { - if (to.query.fromLesson) { + if (to.query.fromLesson || to.path === '/persona') { noSidebar.value = true } else { noSidebar.value = false diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue index 8b18c389..05ed106d 100644 --- a/frontend/src/components/AppSidebar.vue +++ b/frontend/src/components/AppSidebar.vue @@ -39,7 +39,11 @@ {{ __('More') }} - - + + {{ __('New') }} +
@@ -38,12 +38,11 @@ :options="{ showTooltip: false, selectable: false, - getRowRoute: (row) => ({ - name: 'AssignmentForm', - params: { - assignmentID: row.name, - }, - }), + onRowClick: (row) => { + if (readOnlyMode) return + assignmentID = row.name + showAssignmentForm = true + }, }" > @@ -72,6 +71,11 @@
+ diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue index 671c3c39..44061b16 100644 --- a/frontend/src/pages/Profile.vue +++ b/frontend/src/pages/Profile.vue @@ -25,7 +25,11 @@ @select="(imageUrl) => coverImage.submit({ url: imageUrl })" >