Merge branch 'link-verification' into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
commit
f668455dff
4 changed files with 25 additions and 5 deletions
|
@ -10,11 +10,13 @@ import withLoadMore from '../../hocs/with_load_more/with_load_more'
|
||||||
import { debounce } from 'lodash'
|
import { debounce } from 'lodash'
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
import {
|
import {
|
||||||
faCircleNotch
|
faCircleNotch,
|
||||||
|
faCircleCheck
|
||||||
} from '@fortawesome/free-solid-svg-icons'
|
} from '@fortawesome/free-solid-svg-icons'
|
||||||
|
|
||||||
library.add(
|
library.add(
|
||||||
faCircleNotch
|
faCircleNotch,
|
||||||
|
faCircleCheck
|
||||||
)
|
)
|
||||||
|
|
||||||
const FollowerList = withLoadMore({
|
const FollowerList = withLoadMore({
|
||||||
|
|
|
@ -37,6 +37,15 @@
|
||||||
:html="field.value"
|
:html="field.value"
|
||||||
:emoji="user.emoji"
|
:emoji="user.emoji"
|
||||||
/>
|
/>
|
||||||
|
<span
|
||||||
|
v-if="field.verified_at"
|
||||||
|
class="user-profile-field-validated"
|
||||||
|
>
|
||||||
|
<FAIcon
|
||||||
|
icon="check-circle"
|
||||||
|
:title="$t('user_profile.field_validated')"
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
|
@ -225,6 +234,11 @@
|
||||||
padding: 0.5em 1.5em;
|
padding: 0.5em 1.5em;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.user-profile-field-validated {
|
||||||
|
margin-left: 1rem;
|
||||||
|
color: green;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1183,7 +1183,8 @@
|
||||||
"user_profile": {
|
"user_profile": {
|
||||||
"profile_does_not_exist": "Sorry, this profile does not exist.",
|
"profile_does_not_exist": "Sorry, this profile does not exist.",
|
||||||
"profile_loading_error": "Sorry, there was an error loading this profile.",
|
"profile_loading_error": "Sorry, there was an error loading this profile.",
|
||||||
"timeline_title": "User timeline"
|
"timeline_title": "User timeline",
|
||||||
|
"field_validated": "Link Verified"
|
||||||
},
|
},
|
||||||
"user_reporting": {
|
"user_reporting": {
|
||||||
"add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
|
"add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
|
||||||
|
|
|
@ -68,13 +68,16 @@ export const parseUser = (data) => {
|
||||||
output.fields_html = data.fields.map(field => {
|
output.fields_html = data.fields.map(field => {
|
||||||
return {
|
return {
|
||||||
name: escape(field.name),
|
name: escape(field.name),
|
||||||
value: field.value
|
value: field.value,
|
||||||
|
verified_at: field.verified_at
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
console.log(output.fields_html)
|
||||||
output.fields_text = data.fields.map(field => {
|
output.fields_text = data.fields.map(field => {
|
||||||
return {
|
return {
|
||||||
name: unescape(field.name.replace(/<[^>]*>/g, '')),
|
name: unescape(field.name.replace(/<[^>]*>/g, '')),
|
||||||
value: unescape(field.value.replace(/<[^>]*>/g, ''))
|
value: unescape(field.value.replace(/<[^>]*>/g, '')),
|
||||||
|
verified_at: field.verified_at
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue