From 33c76e842f1e244ae91f1a77e43d3cee05b30e62 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 25 Sep 2024 11:10:26 +0530
Subject: [PATCH 1/4] fix: evaluation error message issue

---
 frontend/src/components/Modals/EvaluationModal.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Modals/EvaluationModal.vue b/frontend/src/components/Modals/EvaluationModal.vue
index b103a4f2..201e4d94 100644
--- a/frontend/src/components/Modals/EvaluationModal.vue
+++ b/frontend/src/components/Modals/EvaluationModal.vue
@@ -131,10 +131,16 @@ function submitEvaluation(close) {
 		},
 		onError(err) {
 			let message = err.messages?.[0] || err
-			let unavailabilityMessage = message.includes('unavailable')
+			let unavailabilityMessage
+
+			if (typeof message === 'string') {
+				unavailabilityMessage = message?.includes('unavailable')
+			} else {
+				unavailabilityMessage = false
+			}
 
 			createToast({
-				title: unavailabilityMessage ? 'Evaluator is Unavailable' : 'Error',
+				title: unavailabilityMessage ? __('Evaluator is Unavailable') : '',
 				text: message,
 				icon: unavailabilityMessage ? 'alert-circle' : 'x',
 				iconClasses: 'bg-yellow-600 text-white rounded-md p-px',

From b74c1670ca0015b2b5c437029ef06b6380abd4bc Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Wed, 25 Sep 2024 05:47:45 +0000
Subject: [PATCH 2/4] chore(release): Bumped to Version 2.6.0

---
 lms/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/__init__.py b/lms/__init__.py
index 50062f87..e5e59e38 100644
--- a/lms/__init__.py
+++ b/lms/__init__.py
@@ -1 +1 @@
-__version__ = "2.5.0"
+__version__ = "2.6.0"

From e18f0c9dad280ee863ea831b5cafa2c85e6d7529 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 26 Sep 2024 12:09:58 +0530
Subject: [PATCH 3/4] feat:  brand settings

---
 frontend/src/components/BrandSettings.vue   |  67 ++++++++++
 frontend/src/components/Modals/Settings.vue |  64 ++++++++-
 frontend/src/components/SettingDetails.vue  |  92 +++----------
 frontend/src/components/SettingFields.vue   | 136 ++++++++++++++++++++
 frontend/src/components/UserDropdown.vue    |  13 +-
 frontend/src/pages/ProfileAbout.vue         |   2 +-
 frontend/src/utils/index.js                 |   7 +
 lms/config/__init__.py                      |   0
 lms/config/desktop.py                       |  13 --
 lms/config/docs.py                          |  12 --
 lms/lms/api.py                              |  12 +-
 11 files changed, 304 insertions(+), 114 deletions(-)
 create mode 100644 frontend/src/components/BrandSettings.vue
 create mode 100644 frontend/src/components/SettingFields.vue
 delete mode 100644 lms/config/__init__.py
 delete mode 100644 lms/config/desktop.py
 delete mode 100644 lms/config/docs.py

diff --git a/frontend/src/components/BrandSettings.vue b/frontend/src/components/BrandSettings.vue
new file mode 100644
index 00000000..dc6cbe8b
--- /dev/null
+++ b/frontend/src/components/BrandSettings.vue
@@ -0,0 +1,67 @@
+<template>
+	<div class="flex flex-col justify-between h-full">
+		<div>
+			<div class="font-semibold mb-1">
+				{{ __(label) }}
+			</div>
+			<div class="text-xs text-gray-600">
+				{{ __(description) }}
+			</div>
+		</div>
+		<SettingFields :fields="fields" :data="data.data" />
+		<div class="flex flex-row-reverse mt-auto">
+			<Button variant="solid" :loading="saveSettings.loading" @click="update">
+				{{ __('Update') }}
+			</Button>
+		</div>
+	</div>
+</template>
+<script setup>
+import { createResource, Button } from 'frappe-ui'
+import SettingFields from '@/components/SettingFields.vue'
+
+const props = defineProps({
+	fields: {
+		type: Array,
+		required: true,
+	},
+	data: {
+		type: Object,
+		required: true,
+	},
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+	},
+})
+
+const saveSettings = createResource({
+	url: 'frappe.client.set_value',
+	makeParams(values) {
+		console.log(values)
+		return {
+			doctype: 'Website Settings',
+			name: 'Website Settings',
+			fieldname: values.fields,
+		}
+	},
+})
+
+const update = () => {
+	let fieldsToSave = {}
+	let imageFields = ['favicon', 'banner_image', 'footer_logo']
+	props.fields.forEach((f) => {
+		if (imageFields.includes(f.name)) {
+			fieldsToSave[f.name] = f.value ? f.value.file_url : null
+		} else {
+			fieldsToSave[f.name] = f.value
+		}
+	})
+	saveSettings.submit({
+		fields: fieldsToSave,
+	})
+}
+</script>
diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue
index 843c945c..a86fb18e 100644
--- a/frontend/src/components/Modals/Settings.vue
+++ b/frontend/src/components/Modals/Settings.vue
@@ -45,6 +45,13 @@
 						:label="activeTab.label"
 						:description="activeTab.description"
 					/>
+					<BrandSettings
+						v-else-if="activeTab.label === 'Branding'"
+						:label="activeTab.label"
+						:description="activeTab.description"
+						:fields="activeTab.fields"
+						:data="branding"
+					/>
 					<SettingDetails
 						v-else
 						:fields="activeTab.fields"
@@ -58,13 +65,14 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createDocumentResource } from 'frappe-ui'
+import { Dialog, createDocumentResource, createResource } from 'frappe-ui'
 import { ref, computed, watch } from 'vue'
 import { useSettings } from '@/stores/settings'
 import SettingDetails from '../SettingDetails.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import Members from '@/components/Members.vue'
 import Categories from '@/components/Categories.vue'
+import BrandSettings from '@/components/BrandSettings.vue'
 
 const show = defineModel()
 const doctype = ref('LMS Settings')
@@ -79,6 +87,12 @@ const data = createDocumentResource({
 	auto: true,
 })
 
+const branding = createResource({
+	url: 'lms.lms.api.get_branding',
+	auto: true,
+	cache: 'brand',
+})
+
 const tabsStructure = computed(() => {
 	return [
 		{
@@ -155,6 +169,54 @@ const tabsStructure = computed(() => {
 			label: 'Customise',
 			hideLabel: false,
 			items: [
+				{
+					label: 'Branding',
+					icon: 'Blocks',
+					description:
+						'Customize the brand information of your learning system',
+					fields: [
+						{
+							label: 'Brand Name',
+							name: 'app_name',
+							type: 'text',
+						},
+						{
+							label: 'Copyright',
+							name: 'copyright',
+							type: 'text',
+						},
+						{
+							label: 'Address',
+							name: 'address',
+							type: 'textarea',
+							rows: 4,
+						},
+						{
+							label: 'Footer "Powered By"',
+							name: 'footer_powered',
+							type: 'textarea',
+							rows: 4,
+						},
+						{
+							type: 'Column Break',
+						},
+						{
+							label: 'Logo',
+							name: 'banner_image',
+							type: 'Upload',
+						},
+						{
+							label: 'Favicon',
+							name: 'favicon',
+							type: 'Upload',
+						},
+						{
+							label: 'Footer Logo',
+							name: 'footer_logo',
+							type: 'Upload',
+						},
+					],
+				},
 				{
 					label: 'Sidebar',
 					icon: 'PanelLeftIcon',
diff --git a/frontend/src/components/SettingDetails.vue b/frontend/src/components/SettingDetails.vue
index e54b4b0d..e337ce58 100644
--- a/frontend/src/components/SettingDetails.vue
+++ b/frontend/src/components/SettingDetails.vue
@@ -1,53 +1,23 @@
 <template>
 	<div class="flex flex-col justify-between h-full">
 		<div>
-			<div class="font-semibold mb-1">
-				{{ __(label) }}
+			<div class="flex itemsc-center justify-between">
+				<div class="font-semibold mb-1">
+					{{ __(label) }}
+				</div>
+				<Badge
+					v-if="data.isDirty"
+					:label="__('Not Saved')"
+					variant="subtle"
+					theme="orange"
+				/>
 			</div>
 			<div class="text-xs text-gray-600">
 				{{ __(description) }}
 			</div>
 		</div>
-		<div
-			class="my-5"
-			:class="{ 'flex justify-between w-full': columns.length > 1 }"
-		>
-			<div v-for="(column, index) in columns" :key="index">
-				<div
-					class="flex flex-col space-y-5"
-					:class="columns.length > 1 ? 'w-72' : 'w-full'"
-				>
-					<div v-for="field in column">
-						<Link
-							v-if="field.type == 'Link'"
-							v-model="field.value"
-							:doctype="field.doctype"
-							:label="field.label"
-						/>
 
-						<Codemirror
-							v-else-if="field.type == 'Code'"
-							v-model:value="field.value"
-							:label="field.label"
-							:height="200"
-							:options="{
-								mode: field.mode,
-								theme: 'seti',
-							}"
-						/>
-
-						<FormControl
-							v-else
-							:key="field.name"
-							v-model="field.value"
-							:label="field.label"
-							:type="field.type"
-							:rows="field.rows"
-						/>
-					</div>
-				</div>
-			</div>
-		</div>
+		<SettingFields :fields="fields" :data="data.doc" />
 		<div class="flex flex-row-reverse mt-auto">
 			<Button variant="solid" :loading="data.save.loading" @click="update">
 				{{ __('Update') }}
@@ -57,12 +27,8 @@
 </template>
 
 <script setup>
-import { FormControl, Button } from 'frappe-ui'
-import { computed } from 'vue'
-import Link from '@/components/Controls/Link.vue'
-import Codemirror from 'codemirror-editor-vue3'
-import 'codemirror/theme/seti.css'
-import 'codemirror/mode/htmlmixed/htmlmixed.js'
+import { Button, Badge } from 'frappe-ui'
+import SettingFields from '@/components/SettingFields.vue'
 
 const props = defineProps({
 	fields: {
@@ -82,40 +48,16 @@ const props = defineProps({
 	},
 })
 
-const columns = computed(() => {
-	const cols = []
-	let currentColumn = []
-
-	props.fields.forEach((field) => {
-		if (field.type === 'Column Break') {
-			if (currentColumn.length > 0) {
-				cols.push(currentColumn)
-				currentColumn = []
-			}
-		} else {
-			if (field.type == 'checkbox') {
-				field.value = props.data.doc[field.name] ? true : false
-			} else {
-				field.value = props.data.doc[field.name]
-			}
-			currentColumn.push(field)
-		}
-	})
-
-	if (currentColumn.length > 0) {
-		cols.push(currentColumn)
-	}
-
-	return cols
-})
-
 const update = () => {
 	props.fields.forEach((f) => {
-		props.data.doc[f.name] = f.value
+		if (f.type != 'Column Break') {
+			props.data.doc[f.name] = f.value
+		}
 	})
 	props.data.save.submit()
 }
 </script>
+
 <style>
 .CodeMirror pre.CodeMirror-line,
 .CodeMirror pre.CodeMirror-line-like {
diff --git a/frontend/src/components/SettingFields.vue b/frontend/src/components/SettingFields.vue
new file mode 100644
index 00000000..d2b9db31
--- /dev/null
+++ b/frontend/src/components/SettingFields.vue
@@ -0,0 +1,136 @@
+<template>
+	<div
+		class="my-5"
+		:class="{ 'flex justify-between w-full': columns.length > 1 }"
+	>
+		<div v-for="(column, index) in columns" :key="index">
+			<div
+				class="flex flex-col space-y-5"
+				:class="columns.length > 1 ? 'w-72' : 'w-full'"
+			>
+				<div v-for="field in column">
+					<Link
+						v-if="field.type == 'Link'"
+						v-model="data[field.name]"
+						:doctype="field.doctype"
+						:label="__(field.label)"
+					/>
+
+					<div v-else-if="field.type == 'Code'">
+						<div>
+							{{ __(field.label) }}
+						</div>
+						<Codemirror
+							v-model:value="data[field.name]"
+							:height="200"
+							:options="{
+								mode: field.mode,
+								theme: 'seti',
+							}"
+						/>
+					</div>
+
+					<div v-else-if="field.type == 'Upload'">
+						<div class="text-sm text-gray-600 mb-1">
+							{{ __(field.label) }}
+						</div>
+						<FileUploader
+							v-if="!data[field.name]"
+							:fileTypes="['image/*']"
+							:validateFile="validateFile"
+							@success="(file) => (data[field.name] = file)"
+						>
+							<template
+								v-slot="{ file, progress, uploading, openFileSelector }"
+							>
+								<div class="">
+									<Button @click="openFileSelector" :loading="uploading">
+										{{
+											uploading ? `Uploading ${progress}%` : 'Upload an image'
+										}}
+									</Button>
+								</div>
+							</template>
+						</FileUploader>
+						<div v-else>
+							<div class="flex items-center text-sm">
+								<div class="border rounded-md p-2 mr-2">
+									<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
+								</div>
+								<div class="flex flex-col flex-wrap">
+									<span class="break-all">
+										{{ data[field.name]?.file_name }}
+									</span>
+									<span class="text-sm text-gray-500 mt-1">
+										{{ getFileSize(data[field.name]?.file_size) }}
+									</span>
+								</div>
+								<X
+									@click="data[field.name] = null"
+									class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+								/>
+							</div>
+						</div>
+					</div>
+
+					<FormControl
+						v-else
+						:key="field.name"
+						v-model="data[field.name]"
+						:label="__(field.label)"
+						:type="field.type"
+						:rows="field.rows"
+					/>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup>
+import { FormControl, FileUploader, Button } from 'frappe-ui'
+import { computed } from 'vue'
+import { getFileSize } from '@/utils'
+import { X, FileText } from 'lucide-vue-next'
+import Link from '@/components/Controls/Link.vue'
+import Codemirror from 'codemirror-editor-vue3'
+import 'codemirror/theme/seti.css'
+import 'codemirror/mode/htmlmixed/htmlmixed.js'
+
+const props = defineProps({
+	fields: {
+		type: Array,
+		required: true,
+	},
+	data: {
+		type: Object,
+		required: true,
+	},
+})
+
+const columns = computed(() => {
+	const cols = []
+	let currentColumn = []
+
+	props.fields.forEach((field) => {
+		if (field.type === 'Column Break') {
+			if (currentColumn.length > 0) {
+				cols.push(currentColumn)
+				currentColumn = []
+			}
+		} else {
+			if (field.type == 'checkbox') {
+				field.value = props.data[field.name] ? true : false
+			} else {
+				field.value = props.data[field.name]
+			}
+			currentColumn.push(field)
+		}
+	})
+
+	if (currentColumn.length > 0) {
+		cols.push(currentColumn)
+	}
+
+	return cols
+})
+</script>
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 5071513d..644a7ee8 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -11,11 +11,11 @@
 						: 'hover:bg-gray-200 px-2 w-52'
 				"
 			>
-				<span
-					v-if="branding.data?.brand_html"
-					v-html="branding.data?.brand_html"
+				<img
+					v-if="branding.data?.banner_image"
+					:src="branding.data?.banner_image.file_url"
 					class="w-8 h-8 rounded flex-shrink-0"
-				></span>
+				/>
 				<LMSLogo v-else class="w-8 h-8 rounded flex-shrink-0" />
 				<div
 					class="flex flex-1 flex-col text-left duration-300 ease-in-out"
@@ -28,11 +28,10 @@
 					<div class="text-base font-medium text-gray-900 leading-none">
 						<span
 							v-if="
-								branding.data?.brand_name &&
-								branding.data?.brand_name != 'Frappe'
+								branding.data?.app_name && branding.data?.app_name != 'Frappe'
 							"
 						>
-							{{ branding.data?.brand_name }}
+							{{ branding.data?.app_name }}
 						</span>
 						<span v-else> Learning </span>
 					</div>
diff --git a/frontend/src/pages/ProfileAbout.vue b/frontend/src/pages/ProfileAbout.vue
index 70b13e0f..d9a457eb 100644
--- a/frontend/src/pages/ProfileAbout.vue
+++ b/frontend/src/pages/ProfileAbout.vue
@@ -142,7 +142,7 @@ const shareOnSocial = (badge, medium) => {
 	const summary = `I am happy to announce that I earned the ${
 		badge.badge
 	} badge on ${dayjs(badge.issued_on).format('DD MMM YYYY')} at ${
-		branding.data?.brand_name
+		branding.data?.app_name
 	}.`
 
 	if (medium == 'LinkedIn')
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index a95f1aa2..b27f7982 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -499,3 +499,10 @@ export function singularize(word) {
 		(r) => endings[r]
 	)
 }
+
+export const validateFile = (file) => {
+	let extension = file.name.split('.').pop().toLowerCase()
+	if (!['jpg', 'jpeg', 'png', 'webp'].includes(extension)) {
+		return __('Only image file is allowed.')
+	}
+}
diff --git a/lms/config/__init__.py b/lms/config/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lms/config/desktop.py b/lms/config/desktop.py
deleted file mode 100644
index 94ae99e0..00000000
--- a/lms/config/desktop.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from frappe import _
-
-
-def get_data():
-	return [
-		{
-			"module_name": "Community",
-			"color": "grey",
-			"icon": "octicon octicon-file-directory",
-			"type": "module",
-			"label": _("Community"),
-		}
-	]
diff --git a/lms/config/docs.py b/lms/config/docs.py
deleted file mode 100644
index d6446dfe..00000000
--- a/lms/config/docs.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-Configuration for docs
-"""
-
-# source_link = "https://github.com/[org_name]/community"
-# docs_base_url = "https://[org_name].github.io/community"
-# headline = "App that does everything"
-# sub_heading = "Yes, you got that right the first time, everything"
-
-
-def get_context(context):
-	context.brand_html = "Community"
diff --git a/lms/lms/api.py b/lms/lms/api.py
index de1921c3..9fa46404 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -289,11 +289,13 @@ def get_file_info(file_url):
 @frappe.whitelist(allow_guest=True)
 def get_branding():
 	"""Get branding details."""
-	return {
-		"brand_name": frappe.db.get_single_value("Website Settings", "app_name"),
-		"brand_html": frappe.db.get_single_value("Website Settings", "brand_html"),
-		"favicon": frappe.db.get_single_value("Website Settings", "favicon"),
-	}
+	website_settings = frappe.get_single("Website Settings")
+	image_fields = ["banner_image", "footer_logo", "favicon"]
+
+	for field in image_fields:
+		website_settings.update({field: get_file_info(website_settings.get(field))})
+
+	return website_settings
 
 
 @frappe.whitelist()

From 11a9bff57da2312e5993c800396a1abe50db0812 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 26 Sep 2024 12:58:00 +0530
Subject: [PATCH 4/4] fix: dirty form for branding section

---
 frontend/src/components/BrandSettings.vue | 24 ++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/BrandSettings.vue b/frontend/src/components/BrandSettings.vue
index dc6cbe8b..881021b5 100644
--- a/frontend/src/components/BrandSettings.vue
+++ b/frontend/src/components/BrandSettings.vue
@@ -1,8 +1,16 @@
 <template>
 	<div class="flex flex-col justify-between h-full">
 		<div>
-			<div class="font-semibold mb-1">
-				{{ __(label) }}
+			<div class="flex items-center justify-between">
+				<div class="font-semibold mb-1">
+					{{ __(label) }}
+				</div>
+				<Badge
+					v-if="isDirty"
+					:label="__('Not Saved')"
+					variant="subtle"
+					theme="orange"
+				/>
 			</div>
 			<div class="text-xs text-gray-600">
 				{{ __(description) }}
@@ -17,8 +25,11 @@
 	</div>
 </template>
 <script setup>
-import { createResource, Button } from 'frappe-ui'
+import { createResource, Button, Badge } from 'frappe-ui'
 import SettingFields from '@/components/SettingFields.vue'
+import { watch, ref } from 'vue'
+
+const isDirty = ref(false)
 
 const props = defineProps({
 	fields: {
@@ -64,4 +75,11 @@ const update = () => {
 		fields: fieldsToSave,
 	})
 }
+
+watch(props.data, (newData) => {
+	console.log(newData)
+	if (newData && !isDirty.value) {
+		isDirty.value = true
+	}
+})
 </script>