Merge branch 'editProfile' into 'develop'

Minor change: Add edit profile button onto self user card

See merge request pleroma/pleroma-fe!1398
This commit is contained in:
Shpuld Shpludson 2021-07-19 16:35:28 +00:00
commit 891611816c
5 changed files with 27 additions and 3 deletions

View file

@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added quick filters for notifications - Added quick filters for notifications
- Implemented user option to change sidebar position to the right side - Implemented user option to change sidebar position to the right side
- Implemented user option to hide floating shout panel - Implemented user option to hide floating shout panel
- Implemented "edit profile" button if viewing own profile which opens profile settings
### Fixed ### Fixed
- Fixed follow request count showing in the wrong location in mobile view - Fixed follow request count showing in the wrong location in mobile view

View file

@ -3,6 +3,7 @@ Contributors of this project.
- Constance Variable (lambadalambda@social.heldscal.la): Code - Constance Variable (lambadalambda@social.heldscal.la): Code
- Coco Snuss (cocosnuss@social.heldscal.la): Code - Coco Snuss (cocosnuss@social.heldscal.la): Code
- wakarimasen (wakarimasen@shitposter.club): NSFW hiding image - wakarimasen (wakarimasen@shitposter.club): NSFW hiding image
- eris (eris@disqordia.space): Code
- dtluna (dtluna@social.heldscal.la): Code - dtluna (dtluna@social.heldscal.la): Code
- sonyam (sonyam@social.heldscal.la): Background images - sonyam (sonyam@social.heldscal.la): Background images
- hakui (hakui@freezepeach.xyz): CSS and styling - hakui (hakui@freezepeach.xyz): CSS and styling

View file

@ -12,14 +12,16 @@ import {
faBell, faBell,
faRss, faRss,
faSearchPlus, faSearchPlus,
faExternalLinkAlt faExternalLinkAlt,
faEdit
} from '@fortawesome/free-solid-svg-icons' } from '@fortawesome/free-solid-svg-icons'
library.add( library.add(
faRss, faRss,
faBell, faBell,
faSearchPlus, faSearchPlus,
faExternalLinkAlt faExternalLinkAlt,
faEdit
) )
export default { export default {
@ -153,6 +155,9 @@ export default {
this.$store.state.instance.restrictedNicknames this.$store.state.instance.restrictedNicknames
) )
}, },
openProfileTab () {
this.$store.dispatch('openSettingsModalTab', 'profile')
},
zoomAvatar () { zoomAvatar () {
const attachment = { const attachment = {
url: this.user.profile_image_url_original, url: this.user.profile_image_url_original,

View file

@ -53,6 +53,18 @@
> >
{{ user.name }} {{ user.name }}
</div> </div>
<button
v-if="!isOtherUser && user.is_local"
class="button-unstyled edit-profile-button"
@click.stop="openProfileTab"
>
<FAIcon
fixed-width
class="icon"
icon="edit"
:title="$t('user_card.edit_profile')"
/>
</button>
<button <button
v-if="isOtherUser && !user.is_local" v-if="isOtherUser && !user.is_local"
:href="user.statusnet_profile_url" :href="user.statusnet_profile_url"
@ -426,7 +438,7 @@
} }
} }
.external-link-button { .external-link-button, .edit-profile-button {
cursor: pointer; cursor: pointer;
width: 2.5em; width: 2.5em;
text-align: center; text-align: center;
@ -578,6 +590,10 @@
} }
} }
.sidebar .edit-profile-button {
display: none;
}
.user-counts { .user-counts {
display: flex; display: flex;
line-height:16px; line-height:16px;

View file

@ -719,6 +719,7 @@
"block": "Block", "block": "Block",
"blocked": "Blocked!", "blocked": "Blocked!",
"deny": "Deny", "deny": "Deny",
"edit_profile": "Edit profile",
"favorites": "Favorites", "favorites": "Favorites",
"follow": "Follow", "follow": "Follow",
"follow_sent": "Request sent!", "follow_sent": "Request sent!",