Skip to content

Commit

Permalink
Merge branch 'main' into issue-10420
Browse files Browse the repository at this point in the history
  • Loading branch information
hassnian committed Jul 8, 2024
2 parents d662bbd + 4e1bd8f commit d9d88b8
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
16 changes: 16 additions & 0 deletions components/profile/create/stages/Form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

<!-- bio -->
<NeoField
ref="bioField"
:label="`Short Bio`"
required
:error="!form.description"
Expand All @@ -33,6 +34,19 @@
has-counter
counter-class="mt-3"
:placeholder="'introduce yourself in a few words'" />
<template #message>
<div>
<p
v-if="bioMessage"
class="o-field__message o-field__message-danger">
{{ bioMessage }}
</p>
<div class="flex gap-2 items-center capitalize text-k-grey !pt-2">
<NeoIcon icon="markdown" pack="fab" />
<span>{{ $t('markdownSupported') }} </span>
</div>
</div>
</template>
</NeoField>

<!-- profile picture -->
Expand Down Expand Up @@ -178,6 +192,7 @@ const props = defineProps<{
}>()
const deleteConfirm = ref<Date>()
const bioField = ref()
const now = useNow()
const { $i18n } = useNuxtApp()
Expand All @@ -186,6 +201,7 @@ const profile = inject<{ userProfile: Ref<Profile>; hasProfile: Ref<boolean> }>(
'userProfile',
)
const bioMessage = computed(() => bioField.value?.$data?.newMessage)
const isDeleteConfirmSafetyDelay = computed(() =>
deleteConfirm.value
? now.value.getTime() - deleteConfirm.value.getTime() <
Expand Down
2 changes: 1 addition & 1 deletion libs/ui/src/components/NeoModal/NeoModal.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<teleport to="body" :disabled="!appendToBody">
<teleport to="body" :disabled="!appendToBody" v-bind="$attrs">
<o-modal
v-model:active="isModalActive"
class="neo-modal"
Expand Down
1 change: 1 addition & 0 deletions locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"scheduled": "Scheduled",
"supply": "Supply",
"artist": "Artist",
"markdownSupported": "Markdown supported",
"why": "Why",
"goBack": "Go Back",
"status": "Status",
Expand Down

0 comments on commit d9d88b8

Please sign in to comment.