@@ -65,42 +65,43 @@
username: participant.username,
},
}"
- class="flex rounded-md hover:bg-surface-gray-2 px-3"
>
-
-
+
+
+
-
-
-
- {{ participant.full_name }}
+
+
+
+ {{ participant.full_name }}
+
+
+ {{ participant.headline }}
+
- {{ participant.headline }}
-
-
-
-
- {{ participant.certificate_count }}
- {{
- participant.certificate_count > 1
- ? __('certificates')
- : __('certificate')
- }}
-
-
·
-
- {{ dayjs(participant.issue_date).format('DD MMM YYYY') }}
+
+ {{ participant.certificate_count }}
+ {{
+ participant.certificate_count > 1
+ ? __('certificates')
+ : __('certificate')
+ }}
+
+
·
+
+ {{ dayjs(participant.issue_date).format('DD MMM YYYY') }}
+
@@ -139,7 +140,7 @@ import UserAvatar from '@/components/UserAvatar.vue'
const filters = ref({})
const currentCategory = ref('')
const nameFilter = ref('')
-const openToOpportunities = ref(false)
+const openToWork = ref(false)
const hiring = ref(false)
const { brand } = sessionStore()
const memberCount = ref(0)
@@ -190,14 +191,14 @@ const updateParticipants = () => {
const updateFilters = () => {
filters.value = {
- ...(currentCategory.value && {
+ ...(currentCategory.value.trim('') && {
category: currentCategory.value,
}),
...(nameFilter.value && {
member_name: ['like', `%${nameFilter.value}%`],
}),
- ...(openToOpportunities.value && {
- open_to_opportunities: true,
+ ...(openToWork.value && {
+ open_to_work: true,
}),
...(hiring.value && {
hiring: true,
@@ -210,7 +211,7 @@ const setQueryParams = () => {
let filterKeys = {
category: currentCategory.value,
name: nameFilter.value,
- 'open-to-opportunities': openToOpportunities.value,
+ 'open-to-work': openToWork.value,
hiring: hiring.value,
}
@@ -239,7 +240,7 @@ const setFiltersFromQuery = () => {
let queries = new URLSearchParams(location.search)
nameFilter.value = queries.get('name') || ''
currentCategory.value = queries.get('category') || ''
- openToOpportunities.value = queries.get('open-to-opportunities') === 'true'
+ openToWork.value = queries.get('open-to-opportunities') === 'true'
hiring.value = queries.get('hiring') === 'true'
}
diff --git a/frontend/src/pages/CourseForm.vue b/frontend/src/pages/CourseForm.vue
index 5a412e1c2e..65a91ec4b7 100644
--- a/frontend/src/pages/CourseForm.vue
+++ b/frontend/src/pages/CourseForm.vue
@@ -75,58 +75,11 @@
-
-
- {{ __('Course Image') }}
-
-
-
-
-
-
-
-
-
-
- {{
- __('Appears on the course card in the course list')
- }}
-
-
-
-
-
-
![]()
-
-
-
- {{
- __('Appears on the course card in the course list')
- }}
-
-
-
-
-
+
{
fetchCourseInfo()
} else {
capture('course_form_opened')
- startRecording()
}
window.addEventListener('keydown', keyboardShortcut)
})
@@ -441,7 +392,6 @@ const keyboardShortcut = (e) => {
onBeforeUnmount(() => {
window.removeEventListener('keydown', keyboardShortcut)
- stopRecording()
})
const courseCreationResource = createResource({
@@ -450,7 +400,7 @@ const courseCreationResource = createResource({
return {
doc: {
doctype: 'LMS Course',
- image: course.course_image?.file_url || '',
+ image: course.image,
instructors: instructors.value.map((instructor) => ({
instructor: instructor,
})),
@@ -471,7 +421,7 @@ const courseEditResource = createResource({
doctype: 'LMS Course',
name: values.course,
fieldname: {
- image: course.course_image?.file_url || '',
+ image: course.image,
instructors: instructors.value.map((instructor) => ({
instructor: instructor,
})),
@@ -521,24 +471,10 @@ const courseResource = createResource({
course[key] = course[key] ? true : false
}
- if (data.image) imageResource.reload({ image: data.image })
check_permission()
},
})
-const imageResource = createResource({
- url: 'lms.lms.api.get_file_info',
- makeParams(values) {
- return {
- file_url: values.image,
- }
- },
- auto: false,
- onSuccess(data) {
- course.course_image = data
- },
-})
-
const validateFields = () => {
course.description = sanitizeHTML(course.description)
@@ -655,14 +591,6 @@ const removeTag = (tag) => {
newTag.value = ''
}
-const saveImage = (file) => {
- course.course_image = file
-}
-
-const removeImage = () => {
- course.course_image = null
-}
-
const check_permission = () => {
let user_is_instructor = false
if (user.data?.is_moderator) return
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index 06b7d765db..48fc92000e 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -168,9 +168,6 @@ const courses = createListResource({
cache: ['courses', user.data?.name],
pageLength: pageLength.value,
start: start.value,
- onSuccess(data) {
- setCategories(data)
- },
})
const setCategories = (data) => {
@@ -205,7 +202,7 @@ const identifyUserPersona = async () => {
const getCourseCount = () => {
if (!user.data) return
-
+ if (!user.data.is_moderator) return
call('frappe.client.get_count', {
doctype: 'LMS Course',
}).then((data) => {
@@ -219,7 +216,9 @@ const updateCourses = () => {
courses.update({
filters: filters.value,
})
- courses.reload()
+ courses.reload().then((data) => {
+ setCategories(data)
+ })
}
const updateFilters = () => {
diff --git a/frontend/src/pages/JobForm.vue b/frontend/src/pages/JobForm.vue
index c81d5c6219..1fb6b861e1 100644
--- a/frontend/src/pages/JobForm.vue
+++ b/frontend/src/pages/JobForm.vue
@@ -83,47 +83,11 @@
class="mb-4"
:required="true"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ job.image.file_name }}
-
-
- {{ getFileSize(job.image.file_size) }}
-
-
-
-
-
@@ -150,15 +114,14 @@ import {
createResource,
Button,
TextEditor,
- FileUploader,
usePageMeta,
toast,
} from 'frappe-ui'
import { computed, onMounted, reactive, inject } from 'vue'
-import { FileText, X } from 'lucide-vue-next'
import { sessionStore } from '@/stores/session'
import { useRouter } from 'vue-router'
-import { escapeHTML, getFileSize, sanitizeHTML, validateFile } from '@/utils'
+import { escapeHTML, sanitizeHTML } from '@/utils'
+import Uploader from '@/components/Controls/Uploader.vue'
const user = inject('$user')
const router = useRouter()
@@ -177,7 +140,7 @@ const newJob = createResource({
return {
doc: {
doctype: 'Job Opportunity',
- company_logo: job.image?.file_url,
+ company_logo: job.company_logo,
...job,
},
}
@@ -191,7 +154,7 @@ const updateJob = createResource({
doctype: 'Job Opportunity',
name: props.jobName,
fieldname: {
- company_logo: job.image.file_url,
+ company_logo: job.company_logo,
...job,
},
}
@@ -215,20 +178,6 @@ const jobDetail = createResource({
Object.keys(data).forEach((key) => {
if (Object.hasOwn(job, key)) job[key] = data[key]
})
- if (data.company_logo) imageResource.reload({ image: data.company_logo })
- },
-})
-
-const imageResource = createResource({
- url: 'lms.lms.api.get_file_info',
- makeParams(values) {
- return {
- file_url: values.image,
- }
- },
- auto: false,
- onSuccess(data) {
- job.image = data
},
})
@@ -241,7 +190,7 @@ const job = reactive({
status: 'Open',
company_name: '',
company_website: '',
- image: null,
+ company_logo: null,
description: '',
company_email_address: '',
})
@@ -322,14 +271,6 @@ const validateJobFields = () => {
})
}
-const saveImage = (file) => {
- job.image = file
-}
-
-const removeImage = () => {
- job.image = null
-}
-
const jobTypes = computed(() => {
return [
{ label: 'Full Time', value: 'Full Time' },
diff --git a/frontend/src/pages/Jobs.vue b/frontend/src/pages/Jobs.vue
index 867a014a08..09f876b4f5 100644
--- a/frontend/src/pages/Jobs.vue
+++ b/frontend/src/pages/Jobs.vue
@@ -51,12 +51,12 @@
class="hidden lg:block"
@change="updateJobs"
/>
-
+
@@ -79,17 +79,17 @@
v-model="jobType"
type="select"
:options="jobTypes"
- class="w-full"
+ class="w-full min-w-32"
:placeholder="__('Type')"
- @change="updateJobs"
+ @update:modelValue="updateJobs"
/>
@@ -218,13 +218,13 @@ const updateJobs = () => {
const updateFilters = () => {
filters.value.status = 'Open'
- if (jobType.value) {
+ if (jobType.value && jobType.value !== ' ') {
filters.value.type = jobType.value
} else {
delete filters.value.type
}
- if (workMode.value) {
+ if (workMode.value && workMode.value !== ' ') {
filters.value.work_mode = workMode.value
} else {
delete filters.value.work_mode
@@ -271,7 +271,7 @@ watch(jobs, () => {
const jobTypes = computed(() => {
return [
- { label: '', value: '' },
+ { label: ' ', value: ' ' },
{ label: __('Full Time'), value: 'Full Time' },
{ label: __('Part Time'), value: 'Part Time' },
{ label: __('Contract'), value: 'Contract' },
@@ -281,7 +281,7 @@ const jobTypes = computed(() => {
const workModes = computed(() => {
return [
- { label: '', value: '' },
+ { label: ' ', value: ' ' },
{ label: 'On site', value: 'On-site' },
{ label: 'Hybrid', value: 'Hybrid' },
{ label: 'Remote', value: 'Remote' },
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index b3a3f8a896..41aaa5ebff 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -99,14 +99,14 @@ import EditorJS from '@editorjs/editorjs'
import LessonHelp from '@/components/LessonHelp.vue'
import { ChevronRight } from 'lucide-vue-next'
import { getEditorTools, enablePlyr } from '@/utils'
-import { capture, startRecording, stopRecording } from '@/telemetry'
-import { useOnboarding } from 'frappe-ui/frappe'
+import { useOnboarding, useTelemetry } from 'frappe-ui/frappe'
const { brand } = sessionStore()
const editor = ref(null)
const instructorEditor = ref(null)
const user = inject('$user')
const openInstructorEditor = ref(false)
+const { capture } = useTelemetry()
const { updateOnboardingStep } = useOnboarding('learning')
let autoSaveInterval
let showSuccessMessage = false
@@ -131,7 +131,6 @@ onMounted(() => {
window.location.href = '/login'
}
capture('lesson_form_opened')
- startRecording()
editor.value = renderEditor('content')
instructorEditor.value = renderEditor('instructor-notes')
window.addEventListener('keydown', keyboardShortcut)
@@ -226,7 +225,6 @@ const keyboardShortcut = (e) => {
onBeforeUnmount(() => {
clearInterval(autoSaveInterval)
window.removeEventListener('keydown', keyboardShortcut)
- stopRecording()
})
const newLessonResource = createResource({
@@ -667,6 +665,15 @@ iframe {
padding: 8px;
}
+.codex-editor--narrow .ce-toolbox .ce-popover {
+ right: unset;
+ left: initial;
+}
+
+.ce-popover {
+ border-radius: 12px;
+}
+
.cdx-search-field {
border: none;
}
diff --git a/frontend/src/pages/Notifications.vue b/frontend/src/pages/Notifications.vue
index afcfd9a5f4..238df516a2 100644
--- a/frontend/src/pages/Notifications.vue
+++ b/frontend/src/pages/Notifications.vue
@@ -23,30 +23,120 @@
v-if="notifications?.length"
v-for="log in notifications"
:key="log.name"
- class="flex items-center py-2 justify-between"
+ class="flex space-x-2 px-2 py-4"
+ :class="{
+ 'cursor-pointer': log.link,
+ 'items-center': !showDetails(log) && !isMentionOrComment(log),
+ }"
+ @click="navigateToPage(log)"
>
-
-
-
- {{ __('View') }}
-
-
+
+
+
+
+
+ {{ dayjs(log.creation).fromNow() }}
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+ {{
+ log.document_type === 'LMS Course'
+ ? __('New Course')
+ : __('New Batch')
+ }}
+
+
+ {{ __(log.document_details.title) }}
+
+
+ {{ __(log.document_details.short_introduction) }}
+
+
+
+
+ {{
+ dayjs(log.document_details.start_date).format('DD MMM YYYY')
+ }}
+
+
+
+
+
+ {{ formatTime(log.document_details.start_time) }}
+ {{ log.document_details.timezone }}
+
+
+
+
+
+
+ {{ instructor.full_name }}
+
+
+
+
+
@@ -57,17 +147,19 @@
-
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 671bb6f10a..787c4260a0 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -65,8 +65,8 @@
-