From ce51129e84b14cba4bc7a0b402dc047cdab2df37 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 16 Aug 2024 11:26:11 +0530
Subject: [PATCH 1/6] feat: member list

---
 frontend/src/components/Members.vue         | 70 +++++++++++++++++++++
 frontend/src/components/Modals/Settings.vue | 25 ++++----
 frontend/src/components/SettingDetails.vue  |  2 +-
 lms/lms/api.py                              | 24 +++++++
 4 files changed, 109 insertions(+), 12 deletions(-)
 create mode 100644 frontend/src/components/Members.vue

diff --git a/frontend/src/components/Members.vue b/frontend/src/components/Members.vue
new file mode 100644
index 000000000..3a1917914
--- /dev/null
+++ b/frontend/src/components/Members.vue
@@ -0,0 +1,70 @@
+<template>
+    <div class="text-base p-4">
+        <div class="font-semibold mb-1">
+            {{ __(label) }}
+        </div>
+        <div class="text-xs text-gray-600">
+            {{ __(description) }}
+        </div>
+        <div class="my-4">
+            <div v-for="member in members.data" class="grid grid-cols-5 grid-flow-row py-2">
+                <div class="flex items-center space-x-2 col-span-2">
+                    <Avatar :image="member.user_image" :label="member.full_name" size="sm" />
+                    <div>
+                       {{ member.full_name }}
+                    </div>
+                </div>
+                <div class="text-sm text-gray-700 col-span-2">
+                    {{ member.name }}
+                </div>
+                <div class="text-sm text-gray-700 justify-self-end">
+                    {{ getRole(member.role) }}
+                </div>
+            </div>
+        </div>
+        <div v-if="members.hasNextPage" class="flex justify-center">
+                <Button variant="solid" @click="members.next">
+                    <template #prefix>
+                        <component
+                            :is="icons['RefreshCw']"
+                            class="h-3 w-3 stroke-1.5"
+                        />
+                    </template>
+                    {{ __('Load More') }}
+                </Button>
+            </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { createListResource, Avatar, Button, FormControl } from 'frappe-ui'
+import * as icons from 'lucide-vue-next'
+import { computed } from "vue"
+
+const props = defineProps({
+    label: {
+        type: String,
+        required: true,
+    },
+    description: {
+        type: String,
+        default: '',
+    },
+})
+
+const members = createListResource({
+    url: "lms.lms.api.get_members",
+    doctype: "User",
+    auto: true,
+})
+
+const getRole = (role) => {
+   const map = {
+       'LMS Student': 'Student',
+       'Course Creator': 'Course Instructor',
+       'Moderator': 'Moderator',
+       'Batch Evaluator': 'Evaluator'
+   }
+   return map[role]
+}
+
+</script>
\ No newline at end of file
diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue
index e1d8a36d2..522a9a760 100644
--- a/frontend/src/components/Modals/Settings.vue
+++ b/frontend/src/components/Modals/Settings.vue
@@ -28,11 +28,13 @@
 						</nav>
 					</div>
 				</div>
-				<div class="flex flex-1 flex-col overflow-y-auto">
+				<div v-if="activeTab && data.doc" class="flex flex-1 flex-col overflow-y-auto">
+					<Members v-if="activeTab.label === 'Members'" :label="activeTab.label" :description="activeTab.description"/>
 					<SettingDetails
-						v-if="activeTab && data.doc"
+						v-else
 						:fields="activeTab.fields"
 						:data="data"
+						:label="activeTab.label"
 					/>
 				</div>
 			</div>
@@ -44,6 +46,7 @@ import { Dialog, createDocumentResource } from 'frappe-ui'
 import { ref, computed, watch } from 'vue'
 import SettingDetails from '../SettingDetails.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
+import Members from '@/components/Members.vue'
 
 const show = defineModel()
 const doctype = ref('LMS Settings')
@@ -236,17 +239,17 @@ const tabs = computed(() => {
 				},
 			],
 		},
-		/* {
-		label: 'Settings',
-		hideLabel: true,
-		items: [
 		{
-			label: 'Members',
-			icon: "UserRoundPlus",
-			component: markRaw(MemberSettings),
+			label: 'Settings',
+			hideLabel: true,
+			items: [
+			{
+				label: 'Members',
+				description: 'Manage the members of your learning system',
+				icon: "UserRoundPlus",
+			},
+			],
 		},
-		],
-	}, */
 	]
 
 	return _tabs.map((tab) => {
diff --git a/frontend/src/components/SettingDetails.vue b/frontend/src/components/SettingDetails.vue
index fe4abe9d9..2a4d15c33 100644
--- a/frontend/src/components/SettingDetails.vue
+++ b/frontend/src/components/SettingDetails.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex flex-col justify-between h-full p-8">
+	<div class="flex flex-col justify-between h-full p-10">
 		<div class="flex space-x-10">
 			<div v-for="(column, index) in columns" :key="index">
 				<div class="flex flex-col space-y-4">
diff --git a/lms/lms/api.py b/lms/lms/api.py
index d04ec7839..5e556fb16 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -562,3 +562,27 @@ def get_categories(doctype, filters):
 			categoryOptions.append({"label": category, "value": category})
 
 	return categoryOptions
+
+@frappe.whitelist()
+def get_members(start=0):
+	members = frappe.get_all("User", filters={
+		"enabled": 1,
+		"name": ["not in", ["Administrator", "Guest"]]
+	}, fields=["name", "full_name", "user_image"],
+	page_length=20, start=start)
+
+	for member in members:
+		roles = frappe.get_roles(member.name)
+		if "Moderator" in roles:
+			member.role = "Moderator"
+		elif "Course Creator" in roles:
+			member.role = "Course Creator"
+		elif "Batch Evaluator" in roles:
+			member.role = "Batch Evaluator"
+		elif "LMS Student" in roles:
+			member.role = "LMS Student"
+
+	return members
+		
+
+	
\ No newline at end of file

From cdd46667f332ea9e23922c29e5259437d54219a0 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 19 Aug 2024 11:47:17 +0530
Subject: [PATCH 2/6] feat: add new member

---
 frontend/src/components/Members.vue         | 248 ++++++++++++--------
 frontend/src/components/Modals/Settings.vue |  56 +++--
 frontend/src/components/SettingDetails.vue  |  19 +-
 lms/lms/api.py                              |  20 +-
 lms/overrides/user.py                       |   3 +
 5 files changed, 212 insertions(+), 134 deletions(-)

diff --git a/frontend/src/components/Members.vue b/frontend/src/components/Members.vue
index e36c77265..ee1050558 100644
--- a/frontend/src/components/Members.vue
+++ b/frontend/src/components/Members.vue
@@ -1,55 +1,83 @@
 <template>
-    <div class="text-base p-4">
-        <div class="flex items-center justify-between">
-            <div>
-                <div class="font-semibold mb-1">
-                    {{ __(label) }}
-                </div>
-                <div class="text-xs text-gray-600">
-                    {{ __(description) }}
-                </div>
-            </div>
-            <FormControl v-model="search" :placeholder="__('Search')" type="text" :debounce="300"/>
-        </div>
-        <div class="my-4">
+	<div class="text-base p-4">
+		<div class="flex items-center justify-between">
+			<div>
+				<div class="font-semibold mb-1">
+					{{ __(label) }}
+				</div>
+				<div class="text-xs text-gray-600">
+					{{ __(description) }}
+				</div>
+			</div>
+			<div class="flex item-center space-x-2">
+				<FormControl
+					v-model="search"
+					:placeholder="__('Search')"
+					type="text"
+					:debounce="300"
+				/>
+				<Button @click="() => (showForm = true)">
+					<template #icon>
+						<component :is="icons['Plus']" class="h-3 w-3 stroke-1.5" />
+					</template>
+				</Button>
+			</div>
+		</div>
+		<div class="my-4">
+			<!-- Form to add new member -->
+			<div v-if="showForm" class="flex items-center space-x-2 mb-4">
+				<FormControl
+					v-model="member.email"
+					:placeholder="__('Email')"
+					type="email"
+					class="w-full"
+				/>
+				<FormControl
+					v-model="member.first_name"
+					:placeholder="__('First Name')"
+					type="test"
+					class="w-full"
+				/>
+				<Button @click="addMember()" variant="subtle">
+					{{ __('Add') }}
+				</Button>
+			</div>
 
-            <!-- Form to add new member -->
-            <div v-if="showForm" class="flex items-center space-x-2 mb-4">
-                <FormControl v-model="member.email" :placeholder="__('Email')" type="email" class="w-full"/>
-                <FormControl v-model="member.first_name" :placeholder="__('First Name')" type="test" class="w-full"/>
-                <Button @click="addMember" variant="subtle">
-                    {{ __('Add') }}
-                </Button>
-            </div>
-
-            <!-- Member list -->
-            <div v-for="member in memberList" class="grid grid-cols-5 grid-flow-row py-2 cursor-pointer">
-                <div @click="openProfile(member.username)" class="flex items-center space-x-2 col-span-2">
-                    <Avatar :image="member.user_image" :label="member.full_name" size="sm" />
-                    <div>
-                       {{ member.full_name }}
-                    </div>
-                </div>
-                <div class="text-sm text-gray-700 col-span-2">
-                    {{ member.name }}
-                </div>
-                <div class="text-sm text-gray-700 justify-self-end">
-                    {{ getRole(member.role) }}
-                </div>
-            </div>
-        </div>
-        <div v-if="hasNextPage" class="flex justify-center">
-                <Button variant="solid" @click="members.reload()">
-                    <template #prefix>
-                        <component
-                            :is="icons['RefreshCw']"
-                            class="h-3 w-3 stroke-1.5"
-                        />
-                    </template>
-                    {{ __('Load More') }}
-                </Button>
-            </div>
-    </div>
+			<!-- Member list -->
+			<div
+				v-for="member in memberList"
+				class="grid grid-cols-5 grid-flow-row py-2 cursor-pointer"
+			>
+				<div
+					@click="openProfile(member.username)"
+					class="flex items-center space-x-2 col-span-2"
+				>
+					<Avatar
+						:image="member.user_image"
+						:label="member.full_name"
+						size="sm"
+					/>
+					<div>
+						{{ member.full_name }}
+					</div>
+				</div>
+				<div class="text-sm text-gray-700 col-span-2">
+					{{ member.name }}
+				</div>
+				<div class="text-sm text-gray-700 justify-self-end">
+					{{ getRole(member.role) }}
+				</div>
+			</div>
+		</div>
+		<div v-if="hasNextPage" class="flex justify-center">
+			<Button variant="solid" @click="members.reload()">
+				<template #prefix>
+					<component :is="icons['RefreshCw']" class="h-3 w-3 stroke-1.5" />
+				</template>
+				{{ __('Load More') }}
+			</Button>
+		</div>
+	</div>
 </template>
 <script setup lang="ts">
 import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
@@ -58,72 +86,98 @@ import { useRouter } from 'vue-router'
 import { ref, watch, reactive } from 'vue'
 
 const router = useRouter()
-const show = defineModel("show")
+const show = defineModel('show')
 const search = ref('')
 const start = ref(0)
 const memberList = ref([])
 const hasNextPage = ref(false)
-const showForm = ref(true)
+const showForm = ref(false)
+
 const member = reactive({
-    email: '',
-    first_name: '',
+	email: '',
+	first_name: '',
 })
 
 const props = defineProps({
-    label: {
-        type: String,
-        required: true,
-    },
-    description: {
-        type: String,
-        default: '',
-    },
-    show: {
-        type: Boolean,
-    },
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		default: '',
+	},
+	show: {
+		type: Boolean,
+	},
 })
 
 const members = createResource({
-    url: "lms.lms.api.get_members",
-    makeParams: () => {
-        return {
-            search: search.value,
-            start: start.value
-        }
-    },
-    onSuccess(data) {
-        memberList.value = memberList.value.concat(data)
-        start.value = start.value + 20
-        hasNextPage.value = data.length === 20
-    },
-    auto: true,
+	url: 'lms.lms.api.get_members',
+	makeParams: () => {
+		return {
+			search: search.value,
+			start: start.value,
+		}
+	},
+	onSuccess(data) {
+		memberList.value = memberList.value.concat(data)
+		start.value = start.value + 20
+		hasNextPage.value = data.length === 20
+	},
+	auto: true,
 })
 
 const openProfile = (username) => {
-    show.value = false
-    router.push({
-        name: 'Profile',
-        params: {
-            username: username,
-        },
-    })
+	show.value = false
+	router.push({
+		name: 'Profile',
+		params: {
+			username: username,
+		},
+	})
 }
 
+const newMember = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'User',
+				first_name: member.first_name,
+				email: member.email,
+			},
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		show.value = false
+		router.push({
+			name: 'Profile',
+			params: {
+				username: data.username,
+			},
+		})
+	},
+})
+
+const addMember = () => {
+	newMember.reload()
+}
 
 watch(search, () => {
-    memberList.value = []
-    start.value = 0
-    members.reload()
+	memberList.value = []
+	start.value = 0
+	members.reload()
 })
 
 const getRole = (role) => {
-   const map = {
-       'LMS Student': 'Student',
-       'Course Creator': 'Instructor',
-       'Moderator': 'Moderator',
-       'Batch Evaluator': 'Evaluator'
-   }
-   return map[role]
+	const map = {
+		'LMS Student': 'Student',
+		'Course Creator': 'Instructor',
+		Moderator: 'Moderator',
+		'Batch Evaluator': 'Evaluator',
+	}
+	return map[role]
 }
-
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue
index bbb166bb9..91b2a3816 100644
--- a/frontend/src/components/Modals/Settings.vue
+++ b/frontend/src/components/Modals/Settings.vue
@@ -28,13 +28,22 @@
 						</nav>
 					</div>
 				</div>
-				<div v-if="activeTab && data.doc" class="flex flex-1 flex-col overflow-y-auto">
-					<Members v-if="activeTab.label === 'Members'" :label="activeTab.label" :description="activeTab.description" v-model:show="show"/>
+				<div
+					v-if="activeTab && data.doc"
+					class="flex flex-1 flex-col overflow-y-auto"
+				>
+					<Members
+						v-if="activeTab.label === 'Members'"
+						:label="activeTab.label"
+						:description="activeTab.description"
+						v-model:show="show"
+					/>
 					<SettingDetails
 						v-else
 						:fields="activeTab.fields"
-						:data="data"
 						:label="activeTab.label"
+						:description="activeTab.description"
+						:data="data"
 					/>
 				</div>
 			</div>
@@ -66,9 +75,16 @@ const tabs = computed(() => {
 			label: 'Settings',
 			hideLabel: true,
 			items: [
+				{
+					label: 'Members',
+					description: 'Manage the members of your learning system',
+					icon: 'UserRoundPlus',
+				},
 				{
 					label: 'Payment Gateway',
 					icon: 'DollarSign',
+					description:
+						'Configure the payment gateway and other payment related settings',
 					fields: [
 						{
 							label: 'Razorpay Key',
@@ -115,6 +131,7 @@ const tabs = computed(() => {
 				{
 					label: 'Sidebar',
 					icon: 'PanelLeftIcon',
+					description: 'Customize the sidebar as per your needs',
 					fields: [
 						{
 							label: 'Courses',
@@ -160,6 +177,7 @@ const tabs = computed(() => {
 				{
 					label: 'Email Templates',
 					icon: 'MailPlus',
+					description: 'Create email templates with the content you want',
 					fields: [
 						{
 							label: 'Batch Confirmation Template',
@@ -190,9 +208,11 @@ const tabs = computed(() => {
 				{
 					label: 'Signup',
 					icon: 'LogIn',
+					description:
+						'Customize the signup page to inform users about your terms and policies',
 					fields: [
 						{
-							label: 'Show terms of use on signup page',
+							label: 'Show terms of use on signup',
 							name: 'terms_of_use',
 							type: 'checkbox',
 						},
@@ -203,15 +223,7 @@ const tabs = computed(() => {
 							doctype: 'Web Page',
 						},
 						{
-							label: 'Ask user category during signup',
-							name: 'user_category',
-							type: 'checkbox',
-						},
-						{
-							type: 'Column Break',
-						},
-						{
-							label: 'Show privacy policy on signup page',
+							label: 'Show privacy policy on signup',
 							name: 'privacy_policy',
 							type: 'checkbox',
 						},
@@ -225,7 +237,7 @@ const tabs = computed(() => {
 							type: 'Column Break',
 						},
 						{
-							label: 'Show cookie policy on signup page',
+							label: 'Show cookie policy on signup',
 							name: 'cookie_policy',
 							type: 'checkbox',
 						},
@@ -235,21 +247,15 @@ const tabs = computed(() => {
 							type: 'Link',
 							doctype: 'Web Page',
 						},
+						{
+							label: 'Ask user category during signup',
+							name: 'user_category',
+							type: 'checkbox',
+						},
 					],
 				},
 			],
 		},
-		{
-			label: 'Settings',
-			hideLabel: true,
-			items: [
-			{
-				label: 'Members',
-				description: 'Manage the members of your learning system',
-				icon: "UserRoundPlus",
-			},
-			],
-		},
 	]
 
 	return _tabs.map((tab) => {
diff --git a/frontend/src/components/SettingDetails.vue b/frontend/src/components/SettingDetails.vue
index 2fc836673..0fff5a588 100644
--- a/frontend/src/components/SettingDetails.vue
+++ b/frontend/src/components/SettingDetails.vue
@@ -1,6 +1,14 @@
 <template>
-	<div class="flex flex-col justify-between h-full p-8">
-		<div class="flex space-x-8">
+	<div class="flex flex-col justify-between h-full p-4">
+		<div>
+			<div class="font-semibold mb-1">
+				{{ __(label) }}
+			</div>
+			<div class="text-xs text-gray-600">
+				{{ __(description) }}
+			</div>
+		</div>
+		<div class="flex space-x-8 my-5">
 			<div v-for="(column, index) in columns" :key="index">
 				<div class="flex flex-col space-y-4 w-60">
 					<div v-for="field in column">
@@ -43,6 +51,13 @@ const props = defineProps({
 		type: Object,
 		required: true,
 	},
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+	},
 })
 
 const columns = computed(() => {
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 583125bc8..c26e17395 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -563,19 +563,22 @@ def get_categories(doctype, filters):
 
 	return categoryOptions
 
+
 @frappe.whitelist()
 def get_members(start=0, search=""):
-	filters = {
-			"enabled": 1,
-			"name": ["not in", ["Administrator", "Guest"]]
-		}
-	
+	filters = {"enabled": 1, "name": ["not in", ["Administrator", "Guest"]]}
+
 	if search:
 		filters["full_name"] = ["like", f"%{search}%"]
 
 	print(filters)
-	members = frappe.get_all("User", filters=filters, fields=["name", "full_name", "user_image", "username"],
-	page_length=20, start=start)
+	members = frappe.get_all(
+		"User",
+		filters=filters,
+		fields=["name", "full_name", "user_image", "username"],
+		page_length=20,
+		start=start,
+	)
 
 	for member in members:
 		roles = frappe.get_roles(member.name)
@@ -589,6 +592,3 @@ def get_members(start=0, search=""):
 			member.role = "LMS Student"
 
 	return members
-		
-
-	
\ No newline at end of file
diff --git a/lms/overrides/user.py b/lms/overrides/user.py
index b7659493b..da1d416bf 100644
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -16,6 +16,9 @@ def validate(self):
 		super().validate()
 		self.validate_username_duplicates()
 
+	def after_insert(self):
+		self.add_roles("LMS Student")
+
 	def validate_username_duplicates(self):
 		while not self.username or self.username_exists():
 			self.username = append_number_if_name_exists(

From a3b8ed8f918539d226850446702a156143abc541 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 19 Aug 2024 12:03:32 +0530
Subject: [PATCH 3/6] fix: documented the api

---
 frontend/src/components/Members.vue         | 6 +++---
 frontend/src/components/Modals/Settings.vue | 2 +-
 lms/lms/api.py                              | 7 ++++++-
 package.json                                | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Members.vue b/frontend/src/components/Members.vue
index ee1050558..a6cc8d9b5 100644
--- a/frontend/src/components/Members.vue
+++ b/frontend/src/components/Members.vue
@@ -18,7 +18,7 @@
 				/>
 				<Button @click="() => (showForm = true)">
 					<template #icon>
-						<component :is="icons['Plus']" class="h-3 w-3 stroke-1.5" />
+                        <Plus class="h-3 w-3 stroke-1.5" />
 					</template>
 				</Button>
 			</div>
@@ -72,7 +72,7 @@
 		<div v-if="hasNextPage" class="flex justify-center">
 			<Button variant="solid" @click="members.reload()">
 				<template #prefix>
-					<component :is="icons['RefreshCw']" class="h-3 w-3 stroke-1.5" />
+                    <RefreshCw class="h-3 w-3 stroke-1.5" />
 				</template>
 				{{ __('Load More') }}
 			</Button>
@@ -81,9 +81,9 @@
 </template>
 <script setup lang="ts">
 import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
-import * as icons from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import { ref, watch, reactive } from 'vue'
+import { RefreshCw, Plus } from "lucide-vue-next"
 
 const router = useRouter()
 const show = defineModel('show')
diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue
index 91b2a3816..ec56edbe9 100644
--- a/frontend/src/components/Modals/Settings.vue
+++ b/frontend/src/components/Modals/Settings.vue
@@ -1,6 +1,6 @@
 <template>
 	<Dialog v-model="show" :options="{ size: '3xl' }">
-		<template #body="{ close }">
+		<template #body>
 			<div class="flex h-[calc(100vh_-_8rem)]">
 				<div class="flex w-52 shrink-0 flex-col bg-gray-50 p-2">
 					<h1 class="mb-3 px-2 pt-2 text-lg font-semibold">
diff --git a/lms/lms/api.py b/lms/lms/api.py
index c26e17395..8b235558d 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -566,12 +566,17 @@ def get_categories(doctype, filters):
 
 @frappe.whitelist()
 def get_members(start=0, search=""):
+	""" Get members for the given search term and start index.
+		Args: start (int): Start index for the query.
+			search (str): Search term to filter the results.
+		Returns: List of members.
+	"""
+	
 	filters = {"enabled": 1, "name": ["not in", ["Administrator", "Guest"]]}
 
 	if search:
 		filters["full_name"] = ["like", f"%{search}%"]
 
-	print(filters)
 	members = frappe.get_all(
 		"User",
 		filters=filters,
diff --git a/package.json b/package.json
index 923d2f3ec..f5231fac1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "frappe_lms",
   "version": "1.0.0",
   "description": "Easy to use, open-source, Learning Management System",
-  "workspaces": [
+  "workspaces1": [
     "frappe-ui",
     "frontend"
   ],

From 63f857b8fcc49f2622761a7ac69da2821dd029b0 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 19 Aug 2024 12:12:51 +0530
Subject: [PATCH 4/6] fix: linters

---
 frontend/src/components/Members.vue |  6 +++---
 lms/lms/api.py                      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/Members.vue b/frontend/src/components/Members.vue
index a6cc8d9b5..22dc20747 100644
--- a/frontend/src/components/Members.vue
+++ b/frontend/src/components/Members.vue
@@ -18,7 +18,7 @@
 				/>
 				<Button @click="() => (showForm = true)">
 					<template #icon>
-                        <Plus class="h-3 w-3 stroke-1.5" />
+						<Plus class="h-3 w-3 stroke-1.5" />
 					</template>
 				</Button>
 			</div>
@@ -72,7 +72,7 @@
 		<div v-if="hasNextPage" class="flex justify-center">
 			<Button variant="solid" @click="members.reload()">
 				<template #prefix>
-                    <RefreshCw class="h-3 w-3 stroke-1.5" />
+					<RefreshCw class="h-3 w-3 stroke-1.5" />
 				</template>
 				{{ __('Load More') }}
 			</Button>
@@ -83,7 +83,7 @@
 import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { ref, watch, reactive } from 'vue'
-import { RefreshCw, Plus } from "lucide-vue-next"
+import { RefreshCw, Plus } from 'lucide-vue-next'
 
 const router = useRouter()
 const show = defineModel('show')
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 8b235558d..df2272cd8 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -566,12 +566,12 @@ def get_categories(doctype, filters):
 
 @frappe.whitelist()
 def get_members(start=0, search=""):
-	""" Get members for the given search term and start index.
-		Args: start (int): Start index for the query.
-			search (str): Search term to filter the results.
-		Returns: List of members.
+	"""Get members for the given search term and start index.
+	Args: start (int): Start index for the query.
+	    search (str): Search term to filter the results.
+	Returns: List of members.
 	"""
-	
+
 	filters = {"enabled": 1, "name": ["not in", ["Administrator", "Guest"]]}
 
 	if search:

From 0be5439e8157cbd30ca4a28a5823aa1091c51a5e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 19 Aug 2024 12:31:46 +0530
Subject: [PATCH 5/6] fix: tests

---
 .../invite_request/test_invite_request.py     | 72 +------------------
 1 file changed, 1 insertion(+), 71 deletions(-)

diff --git a/lms/lms/doctype/invite_request/test_invite_request.py b/lms/lms/doctype/invite_request/test_invite_request.py
index b9cac5d3e..0cc820503 100644
--- a/lms/lms/doctype/invite_request/test_invite_request.py
+++ b/lms/lms/doctype/invite_request/test_invite_request.py
@@ -11,74 +11,4 @@
 
 
 class TestInviteRequest(unittest.TestCase):
-	@classmethod
-	def setUpClass(self):
-		create_invite_request("test_invite@example.com")
-
-	def test_create_invite_request(self):
-		if frappe.db.exists("Invite Request", {"invite_email": "test_invite@example.com"}):
-			invite = frappe.db.get_value(
-				"Invite Request",
-				filters={"invite_email": "test_invite@example.com"},
-				fieldname=["invite_email", "status", "signup_email"],
-				as_dict=True,
-			)
-			self.assertEqual(invite.status, "Approved")
-			self.assertEqual(invite.signup_email, None)
-
-	def test_create_invite_request_update(self):
-		if frappe.db.exists("Invite Request", {"invite_email": "test_invite@example.com"}):
-
-			data = {
-				"signup_email": "test_invite@example.com",
-				"username": "test_invite",
-				"full_name": "Test Invite",
-				"password": "Test@invite",
-				"invite_code": frappe.db.get_value(
-					"Invite Request", {"invite_email": "test_invite@example.com"}, "name"
-				),
-			}
-
-			update_invite(data)
-			invite = frappe.db.get_value(
-				"Invite Request",
-				filters={"invite_email": "test_invite@example.com"},
-				fieldname=[
-					"invite_email",
-					"status",
-					"signup_email",
-					"full_name",
-					"username",
-					"invite_code",
-					"name",
-				],
-				as_dict=True,
-			)
-			self.assertEqual(invite.signup_email, "test_invite@example.com")
-			self.assertEqual(invite.full_name, "Test Invite")
-			self.assertEqual(invite.username, "test_invite")
-			self.assertEqual(invite.invite_code, invite.name)
-			self.assertEqual(invite.status, "Registered")
-
-			user = frappe.db.get_value(
-				"User",
-				"test_invite@example.com",
-				fieldname=["first_name", "username", "send_welcome_email", "user_type"],
-				as_dict=True,
-			)
-			self.assertTrue(user)
-			self.assertEqual(user.first_name, invite.full_name.split(" ")[0])
-			self.assertEqual(user.username, invite.username)
-			self.assertEqual(user.send_welcome_email, 0)
-			self.assertEqual(user.user_type, "Website User")
-
-	@classmethod
-	def tearDownClass(self):
-		if frappe.db.exists("User", "test_invite@example.com"):
-			frappe.delete_doc("User", "test_invite@example.com")
-
-		invite_request = frappe.db.exists(
-			"Invite Request", {"invite_email": "test_invite@example.com"}
-		)
-		if invite_request:
-			frappe.delete_doc("Invite Request", invite_request)
+	pass

From 98b8464e1a633c4fb9ed4fdd35db327da6d49745 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 19 Aug 2024 13:07:48 +0530
Subject: [PATCH 6/6] fix: ui test

---
 .github/workflows/ui-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index b9aa4614f..f093e55ac 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -99,6 +99,7 @@ jobs:
           cd ~/frappe-bench/
           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
 
       - name: cypress pre-requisites
         run: |