1
0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-02-02 02:16:46 +01:00

Merge pull request #158 from h3poteto/iss-116

closes #116 Open account profile in notifications
This commit is contained in:
AkiraFukushima 2018-03-30 18:10:13 +09:00 committed by GitHub
commit 1d4a934fae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 6 deletions

View File

@ -5,7 +5,7 @@
<icon name="star" scale="0.7"></icon>
</div>
<div class="action-detail">
<span class="bold">{{ username(message.account) }}</span> favourited your status
<span class="bold" @click="openUser(message.account)">{{ username(message.account) }}</span> favourited your status
</div>
<div class="action-icon">
<img :src="message.account.avatar" />
@ -13,12 +13,12 @@
</div>
<div class="clearfix"></div>
<div class="target">
<div class="icon">
<div class="icon" @click="openUser(message.status.account)">
<img :src="message.status.account.avatar" />
</div>
<div class="detail">
<div class="toot-header">
<div class="user">
<div class="user" @click="openUser(message.status.account)">
{{ username(message.status.account) }}
</div>
<div class="timestamp">
@ -56,6 +56,11 @@ export default {
if (link !== null) {
shell.openExternal(link)
}
},
openUser (account) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
}
}
}
@ -103,6 +108,11 @@ function findLink (target) {
margin-left: 10px;
font-size: 14px;
float: left;
max-width: 80%;
.bold {
cursor: pointer;
}
}
.action-icon {
@ -121,6 +131,7 @@ function findLink (target) {
.icon {
float: left;
width: 42px;
cursor: pointer;
img {
width: 32px;
@ -137,6 +148,7 @@ function findLink (target) {
.user {
float: left;
font-size: 14px;
cursor: pointer;
}
.timestamp {

View File

@ -5,7 +5,7 @@
<icon name="user-plus" scale="0.7"></icon>
</div>
<div class="action-detail">
<span class="bold">{{ username(message.account) }}</span> is now following you
<span class="bold" @click="openUser(message.account)">{{ username(message.account) }}</span> is now following you
</div>
<div class="action-icon">
<img :src="message.account.avatar" />
@ -27,6 +27,11 @@ export default {
} else {
return account.username
}
},
openUser (account) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
}
}
}
@ -61,6 +66,14 @@ export default {
margin-left: 10px;
font-size: 14px;
float: left;
max-width: 80%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
.bold {
cursor: pointer;
}
}
.action-icon {

View File

@ -5,7 +5,7 @@
<icon name="retweet" scala="0.7"></icon>
</div>
<div class="action-detail">
<span class="bold">{{ username(message.account) }}</span> boosted your status
<span class="bold" @clikc="openUser(message.account)">{{ username(message.account) }}</span> boosted your status
</div>
<div class="action-icon">
<img :src="message.account.avatar" />
@ -56,6 +56,11 @@ export default {
if (link !== null) {
shell.openExternal(link)
}
},
openUser (account) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
}
}
}
@ -103,6 +108,11 @@ function findLink (target) {
margin-left: 10px;
font-size: 14px;
float: left;
max-width: 80%;
.bold {
cursor: pointer;
}
}
.action-icon {

View File

@ -18,7 +18,7 @@
<img :src="media.preview_url" @click="openImage(media.url)"/>
</div>
</div>
<div class="reblogger" v-if="message.reblog !== null">
<div class="reblogger" v-if="message.reblog !== null" @click="openUser(message.account)">
<icon name="retweet"></icon>
<span class="reblogger-icon">
<img :src="message.account.avatar" />
@ -215,6 +215,7 @@ function findLink (target) {
.reblogger {
color: #909399;
cursor: pointer;
.reblogger-icon {
img {