chore: merged conflicts

This commit is contained in:
Jannat Patel
2024-11-12 12:13:39 +05:30
39 changed files with 1575 additions and 2035 deletions

View File

@@ -18,6 +18,7 @@
<div class="">
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Subject') }}
<span class="text-red-500">*</span>
</div>
<Input type="text" v-model="announcement.subject" />
</div>

View File

@@ -14,7 +14,12 @@
}"
>
<template #body-content>
<Link doctype="LMS Course" v-model="course" :label="__('Course')" />
<Link
doctype="LMS Course"
v-model="course"
:label="__('Course')"
:required="true"
/>
<Link
doctype="Course Evaluator"
v-model="evaluator"

View File

@@ -69,7 +69,18 @@
:label="__('Headline')"
class="mb-4"
/>
<FormControl type="textarea" v-model="profile.bio" :label="__('Bio')" />
<div class="mb-4">
<div class="mb-1.5 text-sm text-gray-600">
{{ __('Bio') }}
</div>
<TextEditor
:fixedMenu="true"
@change="(val) => (profile.bio = val)"
:content="profile.bio"
editorClass="prose-sm py-2 px-2 min-h-[200px] border-gray-300 hover:border-gray-400 rounded-md bg-gray-200"
/>
</div>
</div>
</template>
</Dialog>
@@ -81,6 +92,7 @@ import {
FileUploader,
Button,
createResource,
TextEditor,
} from 'frappe-ui'
import { reactive, watch, defineModel } from 'vue'
import { FileText, X } from 'lucide-vue-next'

View File

@@ -22,6 +22,7 @@
v-model="liveClass.title"
:label="__('Title')"
class="mb-4"
:required="true"
/>
<Tooltip
:text="
@@ -35,6 +36,7 @@
type="time"
:label="__('Time')"
class="mb-4"
:required="true"
/>
</Tooltip>
<FormControl
@@ -42,6 +44,7 @@
type="select"
:options="getTimezoneOptions()"
:label="__('Timezone')"
:required="true"
/>
</div>
<div>
@@ -50,6 +53,7 @@
type="date"
class="mb-4"
:label="__('Date')"
:required="true"
/>
<Tooltip :text="__('Duration of the live class in minutes')">
<FormControl
@@ -57,6 +61,7 @@
v-model="liveClass.duration"
:label="__('Duration')"
class="mb-4"
:required="true"
/>
</Tooltip>
<FormControl