Commit 8af8df23 authored by feld's avatar feld

Merge branch 'remove-duplicate-profile-links' into 'mfc-develop'

Remove duplicate profile links

Closes #23

See merge request mfc/pleroma-fe!155
parents 6f92c2cd 6a3e02b7
......@@ -245,21 +245,6 @@
<span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span>
</div>
</div>
<div
v-for="(customField, index) in user.customFields"
:key="index"
class="custom-fields"
>
<dl v-if="customField.name && customField.value">
<dt>{{ customField.name }}</dt>
<!-- eslint-disable vue/no-v-html -->
<dd
@click.prevent="linkClicked"
v-html="customField.value"
/>
<!-- eslint-enable vue/no-v-html -->
</dl>
</div>
<!-- eslint-disable vue/no-v-html -->
<p
v-if="!hideBio && user.description_html"
......@@ -372,48 +357,6 @@
border-color: $fallback--border;
border-color: var(--border, $fallback--border);
}
.custom-fields {
margin-top: 5px;
}
dl {
font-weight: 500;
display: flex;
margin: 0px;
margin-bottom: 3px;
padding: 0;
border: 0;
vertical-align: baseline;
box-shadow: 0px 1px 4px rgba(0,0,0,0.35);
}
dt {
width: 35%;
flex: 0 0 auto;
color: var(--lightText, $fallback--lightText);
background-color: $fallback--fg;
background-color: var(--fg, $fallback--fg);
box-sizing: border-box;
overflow: hidden;
text-overflow: ellipsis;
text-align: center;
white-space: nowrap;
padding: 12px;
max-height: 42px;
}
dd {
flex: 1 1 auto;
color: var(--lightText, $fallback--lightText);
box-sizing: border-box;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding: 12px;
max-height: 42px;
}
}
.user-info {
......
......@@ -59,7 +59,6 @@
"general": {
"apply": "Apply",
"submit": "Submit",
"save": "Save",
"more": "More",
"loading": "Loading…",
"generic_error": "An error occured",
......@@ -271,11 +270,6 @@
"desc": "To enable two-factor authentication, enter the code from your two-factor app:"
}
},
"customField": {
"label": "Profile Metadata",
"description": "You can have up to 4 items displayed as a table on your profile",
"add": "Add"
},
"allow_following_move": "Allow auto-follow when following account moves",
"attachmentRadius": "Attachments",
"attachments": "Attachments",
......@@ -410,7 +404,6 @@
"autohide_floating_post_button": "Automatically hide New Post button (mobile)",
"saving_err": "Error saving settings",
"saving_ok": "Settings saved",
"changes_saved": "The changes were saved successfully.",
"search_user_to_block": "Search whom you want to block",
"search_user_to_mute": "Search whom you want to mute",
"security_tab": "Security",
......
......@@ -121,9 +121,6 @@ export const mutations = {
const user = state.usersObject[id]
set(user, 'deactivated', deactivated)
},
saveCustomFields (state, { customFields, id }) {
state.usersObject[id].customFields = customFields
},
setCurrentUser (state, user) {
state.lastLoginName = user.screen_name
state.currentUser = mergeWith(state.currentUser || {}, user, mergeArrayLength)
......
......@@ -75,8 +75,6 @@ export const parseUser = (data) => {
output.bot = data.bot
output.customFields = data.fields || []
if (data.pleroma) {
const relationship = data.pleroma.relationship
......
......@@ -94,8 +94,7 @@ const externalProfileStore = new Vuex.Store({
},
users: {
currentUser: {
credentials: '',
customFields: []
credentials: ''
},
usersObject: { 100: extUser },
users: [extUser],
......@@ -164,8 +163,7 @@ const localProfileStore = new Vuex.Store({
},
users: {
currentUser: {
credentials: '',
customFields: []
credentials: ''
},
usersObject: { 100: localUser, 'testuser': localUser },
users: [localUser],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment