diff --git a/frontend/index.html b/frontend/index.html index 1512b016..0ce72b41 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,7 +2,7 @@ - + Frappe Learning diff --git a/frontend/src/components/DiscussionReplies.vue b/frontend/src/components/DiscussionReplies.vue index 93deac84..3b0558e9 100644 --- a/frontend/src/components/DiscussionReplies.vue +++ b/frontend/src/components/DiscussionReplies.vue @@ -71,6 +71,7 @@ { socket.on('delete_message', (data) => { replies.reload() }) + fetchMentionUsers() }) const replies = createResource({ @@ -150,15 +154,26 @@ const newReplyResource = createResource({ }, }) -const mentionUsers = computed(() => { - let users = Object.values(allUsers.data).map((user) => { - return { - value: user.name, - label: user.full_name, - } - }) - return users -}) +const fetchMentionUsers = () => { + if (user.data?.is_student) { + renderEditor.value = true + } else { + allUsers.reload( + {}, + { + onSuccess(data) { + mentionUsers.value = Object.values(data).map((user) => { + return { + value: user.name, + label: user.full_name, + } + }) + renderEditor.value = true + }, + } + ) + } +} const postReply = () => { newReplyResource.submit( diff --git a/frontend/src/components/JobCard.vue b/frontend/src/components/JobCard.vue index a67e69cf..4e6f3240 100644 --- a/frontend/src/components/JobCard.vue +++ b/frontend/src/components/JobCard.vue @@ -1,71 +1,41 @@ diff --git a/frontend/src/pages/CertifiedParticipants.vue b/frontend/src/pages/CertifiedParticipants.vue index 8351eb20..78c18a7a 100644 --- a/frontend/src/pages/CertifiedParticipants.vue +++ b/frontend/src/pages/CertifiedParticipants.vue @@ -1,93 +1,175 @@ + diff --git a/frontend/src/pages/Jobs.vue b/frontend/src/pages/Jobs.vue index 6ce72657..175f007a 100644 --- a/frontend/src/pages/Jobs.vue +++ b/frontend/src/pages/Jobs.vue @@ -7,47 +7,63 @@ class="h-7" :items="[{ label: __('Jobs'), route: { name: 'Jobs' } }]" /> -
-
- -
-
- - - -
- - - -
+ + + -
+
-
- {{ __('Find the perfect job for you') }} +
+
+ {{ __('Find the perfect job for you') }} +
+
+ + + + +
-
+ +
+
+ {{ __('No jobs posted') }} +
-
- {{ __('No jobs posted') }} -
diff --git a/frontend/src/pages/Notifications.vue b/frontend/src/pages/Notifications.vue index 305cdaf2..f9a360c1 100644 --- a/frontend/src/pages/Notifications.vue +++ b/frontend/src/pages/Notifications.vue @@ -25,7 +25,7 @@ class="flex items-center py-2 justify-between" >
- +
@@ -57,6 +57,7 @@