diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/notification/notification.vue | 93 | ||||
| -rw-r--r-- | src/components/status/status.js | 6 | ||||
| -rw-r--r-- | src/components/status/status.vue | 3 |
3 files changed, 53 insertions, 49 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index b281c7cf..87b0fde2 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -1,57 +1,54 @@ <template> - <div class="notification-item"> - <button @click.prevent="dismiss" class="btn-dismiss">{{$t("notifications.dismiss")}}</button> - <status v-if="notification.type === 'mention'" :compact="true" :statusoid="notification.status"></status> - <div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else> - <a class='avatar-container' :href="notification.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded"> - <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/> - </a> - <div class='notification-right'> - <UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/> - <span class="notification-details"> - <div class="name-and-action"> - <span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span> - <span class="username" v-else :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span> - <span v-if="notification.type === 'like'"> - <i class="fa icon-star lit"></i> - <small>{{$t('notifications.favorited_you')}}</small> - </span> - <span v-if="notification.type === 'repeat'"> - <i class="fa icon-retweet lit" :title="$t('tool_tip.repeat')"></i> - <small>{{$t('notifications.repeated_you')}}</small> - </span> - <span v-if="notification.type === 'follow'"> - <i class="fa icon-user-plus lit"></i> - <small>{{$t('notifications.followed_you')}}</small> - </span> - </div> - <div class="timeago"> - <router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link"> - <timeago :since="notification.action.created_at" :auto-update="240"></timeago> - </router-link> - </div> - </span> - <div class="follow-text" v-if="notification.type === 'follow'"> - <router-link :to="userProfileLink(notification.action.user)"> - @{{notification.action.user.screen_name}} + <status + v-if="notification.type === 'mention'" + :compact="true" + :statusoid="notification.status" + isNotification="true" + @dismissNotification="dismiss" + > + </status> + <div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else> + <a class='avatar-container' :href="notification.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded"> + <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/> + </a> + <div class='notification-right'> + <UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/> + <span class="notification-details"> + <div class="name-and-action"> + <span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span> + <span class="username" v-else :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span> + <span v-if="notification.type === 'like'"> + <i class="fa icon-star lit"></i> + <small>{{$t('notifications.favorited_you')}}</small> + </span> + <span v-if="notification.type === 'repeat'"> + <i class="fa icon-retweet lit" :title="$t('tool_tip.repeat')"></i> + <small>{{$t('notifications.repeated_you')}}</small> + </span> + <span v-if="notification.type === 'follow'"> + <i class="fa icon-user-plus lit"></i> + <small>{{$t('notifications.followed_you')}}</small> + </span> + </div> + <div class="timeago"> + <router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link"> + <timeago :since="notification.action.created_at" :auto-update="240"></timeago> </router-link> </div> - <template v-else> - <status class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status> - </template> + <span class="button-icon" @click.prevent="dismiss"> + <i class="button-icon icon-cancel delete-status"></i> + </span> + </span> + <div class="follow-text" v-if="notification.type === 'follow'"> + <router-link :to="userProfileLink(notification.action.user)"> + @{{notification.action.user.screen_name}} + </router-link> </div> + <template v-else> + <status class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status> + </template> </div> </div> </template> <script src="./notification.js"></script> - -<style lang="scss"> -@import '../../_variables.scss'; - -.notification-item { - display: flex; - flex: 1; - flex-direction: column; -} -</style>
\ No newline at end of file diff --git a/src/components/status/status.js b/src/components/status/status.js index 9e18fe15..4cd26be3 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -25,7 +25,8 @@ const Status = { 'replies', 'isPreview', 'noHeading', - 'inlineExpanded' + 'inlineExpanded', + 'isNotification' ], data () { return { @@ -365,6 +366,9 @@ const Status = { setMedia () { const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments return () => this.$store.dispatch('setMedia', attachments) + }, + dismissNotification () { + this.$emit('dismissNotification') } }, watch: { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1f6d0325..28a44346 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -52,6 +52,9 @@ <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source"> <i class="button-icon icon-link-ext-alt"></i> </a> + <span class="button-icon" v-if="isNotification" @click.prevent="dismissNotification"> + <i class="button-icon icon-cancel delete-status"></i> + </span> <template v-if="expandable && !isPreview"> <a href="#" @click.prevent="toggleExpanded" title="Expand"> <i class="button-icon icon-plus-squared"></i> |