Only reload user if it _is_ a user (#232)

Ref #181

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/232
This commit is contained in:
floatingghost 2022-11-22 14:40:25 +00:00
parent b1f41add0e
commit 105b934f90
6 changed files with 313 additions and 636 deletions

View file

@ -1,4 +1,4 @@
@import '../../_variables.scss';
@import "../../_variables.scss";
.Status {
min-width: 0;
@ -131,10 +131,12 @@
display: flex;
min-width: 0;
flex-wrap: wrap;
img {
aspect-ratio: 1 / 1;
}
.nowrap{
.nowrap {
white-space: nowrap;
}
}
@ -146,7 +148,6 @@
.button-unstyled {
padding: 5px;
margin: -5px;
height: min-content;
&:hover svg {
@ -194,7 +195,7 @@
.reply-to-popover {
.reply-to:hover::before {
content: '';
content: "";
display: block;
position: absolute;
bottom: 0;
@ -204,13 +205,12 @@
}
.faint-link:hover {
// override default
text-decoration: none;
}
&.-strikethrough {
.reply-to::after {
content: '';
content: "";
display: block;
position: absolute;
top: 50%;
@ -349,7 +349,7 @@
margin-left: 0.2em;
&::before {
content: ' ';
content: " ";
}
}
@ -396,7 +396,7 @@
align-items: center;
&::before {
content: '';
content: "";
position: absolute;
height: 100%;
width: 1px;

View file

@ -33,6 +33,8 @@ const FriendList = withLoadMore({
additionalPropNames: ['userId']
})(List)
const isUserPage = ({ name }) => name === 'user-profile' || name === 'external-user-profile'
const UserProfile = {
data () {
return {
@ -182,12 +184,12 @@ const UserProfile = {
},
watch: {
'$route.params.id': function (newVal) {
if (newVal) {
if (isUserPage(this.$route) && newVal) {
this.switchUser(newVal)
}
},
'$route.params.name': function (newVal) {
if (newVal) {
if (isUserPage(this.$route) && newVal) {
this.switchUser(newVal)
}
},