From ad07f883b57bf593d4aa9a5d072581032b9871d0 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 27 Sep 2024 06:19:38 +0530
Subject: [PATCH 1/2] fix: misc UI fixes

---
 frontend/src/components/LiveClass.vue       | 38 +++++++++------------
 frontend/src/components/Modals/Settings.vue |  3 --
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/LiveClass.vue b/frontend/src/components/LiveClass.vue
index 1bf738e7..21fe6e01 100644
--- a/frontend/src/components/LiveClass.vue
+++ b/frontend/src/components/LiveClass.vue
@@ -1,33 +1,30 @@
 <template>
-	<Button
-		v-if="user.data.is_moderator"
-		variant="solid"
-		class="float-right mb-5"
-		@click="openLiveClassModal"
-	>
-		<template #prefix>
-			<Plus class="h-4 w-4" />
-		</template>
-		<span>
-			{{ __('Add Live Class') }}
-		</span>
-	</Button>
-	<div class="text-lg font-semibold mb-5">
-		{{ __('Live Class') }}
+	<div class="flex items-center justify-between mb-5">
+		<div class="text-lg font-semibold">
+			{{ __('Live Class') }}
+		</div>
+		<Button v-if="user.data.is_moderator" @click="openLiveClassModal">
+			<template #prefix>
+				<Plus class="h-4 w-4" />
+			</template>
+			<span>
+				{{ __('Add') }}
+			</span>
+		</Button>
 	</div>
 	<div v-if="liveClasses.data?.length" class="grid grid-cols-2 gap-5">
 		<div
 			v-for="cls in liveClasses.data"
-			class="flex flex-col border rounded-md h-full p-3"
+			class="flex flex-col border rounded-md h-full text-sm text-gray-700 p-3"
 		>
-			<div class="font-semibold text-lg mb-4">
+			<div class="font-semibold text-gray-900 text-lg mb-4">
 				{{ cls.title }}
 			</div>
-			<div class="mb-4">
+			<div class="leading-5 text-gray-700 text-sm mb-4">
 				{{ cls.description }}
 			</div>
 			<div class="flex items-center mb-2">
-				<Calendar class="w-4 h-4 stroke-1.5" />
+				<Calendar class="w-4 h-4 stroke-1.5 text-gray-700" />
 				<span class="ml-2">
 					{{ dayjs(cls.date).format('DD MMMM YYYY') }}
 				</span>
@@ -38,7 +35,7 @@
 					{{ formatTime(cls.time) }}
 				</span>
 			</div>
-			<div class="flex items-center space-x-2 mt-auto">
+			<div class="flex items-center space-x-2 text-gray-900 mt-auto">
 				<a
 					:href="cls.start_url"
 					target="_blank"
@@ -90,7 +87,6 @@ const liveClasses = createListResource({
 	doctype: 'LMS Live Class',
 	filters: {
 		batch_name: props.batch,
-		date: ['>=', new Date()],
 	},
 	fields: [
 		'title',
diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue
index a86fb18e..55581b2f 100644
--- a/frontend/src/components/Modals/Settings.vue
+++ b/frontend/src/components/Modals/Settings.vue
@@ -172,8 +172,6 @@ const tabsStructure = computed(() => {
 				{
 					label: 'Branding',
 					icon: 'Blocks',
-					description:
-						'Customize the brand information of your learning system',
 					fields: [
 						{
 							label: 'Brand Name',
@@ -260,7 +258,6 @@ const tabsStructure = computed(() => {
 				{
 					label: 'Email Templates',
 					icon: 'MailPlus',
-					description: 'Create email templates with the content you want',
 					fields: [
 						{
 							label: 'Batch Confirmation Template',

From 7c055af496717d9b5f70373ac8d272a40b5636bd Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 27 Sep 2024 21:32:46 +0530
Subject: [PATCH 2/2] fix: telemetry capture issue

---
 frontend/src/App.vue                           | 3 +++
 frontend/src/stores/session.js                 | 2 +-
 lms/lms/doctype/course_lesson/course_lesson.py | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index e7dfc8dc..98b1618e 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -14,8 +14,10 @@ import DesktopLayout from './components/DesktopLayout.vue'
 import MobileLayout from './components/MobileLayout.vue'
 import { stopSession } from '@/telemetry'
 import { init as initTelemetry } from '@/telemetry'
+import { usersStore } from '@/stores/user'
 
 const screenSize = useScreenSize()
+let { userResource } = usersStore()
 
 const Layout = computed(() => {
 	if (screenSize.width < 640) {
@@ -26,6 +28,7 @@ const Layout = computed(() => {
 })
 
 onMounted(async () => {
+	if (!userResource.data) return
 	await initTelemetry()
 })
 
diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js
index da4a35fb..93c97d54 100644
--- a/frontend/src/stores/session.js
+++ b/frontend/src/stores/session.js
@@ -17,7 +17,7 @@ export const sessionStore = defineStore('lms-session', () => {
 	}
 
 	let user = ref(sessionUser())
-	if (user) {
+	if (user.value) {
 		allUsers.reload()
 	}
 	const isLoggedIn = computed(() => !!user.value)
diff --git a/lms/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py
index c585a68d..91091561 100644
--- a/lms/lms/doctype/course_lesson/course_lesson.py
+++ b/lms/lms/doctype/course_lesson/course_lesson.py
@@ -126,7 +126,7 @@ def save_progress(lesson, course):
 
 def capture_progress_for_analytics(progress, course):
 	if progress in [25, 50, 75, 100]:
-		capture("course_progress", "lms", {"course": course, "progress": progress})
+		capture("course_progress", "lms", properties={"course": course, "progress": progress})
 
 
 def get_quiz_progress(lesson):