Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/notification-improvements
This commit is contained in:
commit
1b79ae09e0
7 changed files with 68 additions and 5 deletions
|
@ -34,7 +34,8 @@
|
|||
<div class="media status container">
|
||||
<div class="media-left">
|
||||
<a :href="status.user.statusnet_profile_url">
|
||||
<img @click.prevent="toggleUserExpanded" class='avatar' :src="status.user.profile_image_url_original">
|
||||
<img @click.prevent="toggleUserExpanded" :class="{retweeted: retweet}" class='avatar' :src="status.user.profile_image_url_original">
|
||||
<img v-if="retweet" class='avatar-retweeter' :src="statusoid.user.profile_image_url_original"></img>
|
||||
</a>
|
||||
</div>
|
||||
<div class="media-body">
|
||||
|
@ -162,7 +163,23 @@
|
|||
}
|
||||
|
||||
.status .avatar {
|
||||
width: 48px;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
|
||||
&.retweeted {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
margin-right: 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.status img.avatar-retweeter {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
position: absolute;
|
||||
margin-left: 24px;
|
||||
margin-top: 24px;
|
||||
}
|
||||
|
||||
.status.compact .avatar {
|
||||
|
|
18
src/components/user_finder/user_finder.js
Normal file
18
src/components/user_finder/user_finder.js
Normal file
|
@ -0,0 +1,18 @@
|
|||
const UserFinder = {
|
||||
data: () => ({
|
||||
username: undefined
|
||||
}),
|
||||
methods: {
|
||||
findUser (username) {
|
||||
this.$store.state.api.backendInteractor.externalProfile(username)
|
||||
.then((user) => {
|
||||
if (!user.error) {
|
||||
this.$store.commit('addNewUsers', [user])
|
||||
this.$router.push({name: 'user-profile', params: {id: user.id}})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default UserFinder
|
13
src/components/user_finder/user_finder.vue
Normal file
13
src/components/user_finder/user_finder.vue
Normal file
|
@ -0,0 +1,13 @@
|
|||
<template>
|
||||
<div class="user-finder-panel panel panel-default base00-background">
|
||||
<input @keyup.enter="findUser(username)" v-model="username" placeholder="Find user" id="user-finder-input" type="text" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script src="./user_finder.js"></script>
|
||||
|
||||
<style lang="scss">
|
||||
.user-finder-panel {
|
||||
padding: 10px;
|
||||
}
|
||||
</style>
|
Loading…
Add table
Add a link
Reference in a new issue