forked from mirror/pixelfed
daniel
GitHub
commit
a4b697741b
|
|
@ -67,6 +67,8 @@
|
|||
- Updated Timeline.vue, improve followed hashtags. ([728f10d7](https://github.com/pixelfed/pixelfed/commit/728f10d7))
|
||||
- Updated PostComponent, use profileUrl method for comments. ([7ed65fc9](https://github.com/pixelfed/pixelfed/commit/7ed65fc9))
|
||||
- Updated Timeline, fix empty timeline card. ([11eb6acd](https://github.com/pixelfed/pixelfed/commit/11eb6acd))
|
||||
- Updated ap helpers, set text type when appropriate. ([9f4f983f](https://github.com/pixelfed/pixelfed/commit/9f4f983f))
|
||||
- Updated StatusCard, add text support. ([ed14ee48](https://github.com/pixelfed/pixelfed/commit/ed14ee48))
|
||||
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
||||
|
||||
## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -25,10 +25,10 @@
|
|||
"/js/profile-directory.js": "/js/profile-directory.js?id=886f17ad7ab4b2e08019",
|
||||
"/js/quill.js": "/js/quill.js?id=866b31b9b9540305751d",
|
||||
"/js/rempos.js": "/js/rempos.js?id=5830d2c492d5f0328beb",
|
||||
"/js/rempro.js": "/js/rempro.js?id=c6463892101f19f047c5",
|
||||
"/js/rempro.js": "/js/rempro.js?id=d9c7328e6d4134f0b5bf",
|
||||
"/js/search.js": "/js/search.js?id=d777be1b829f5e1e8b34",
|
||||
"/js/status.js": "/js/status.js?id=769001bd404b7aee0073",
|
||||
"/js/story-compose.js": "/js/story-compose.js?id=b16bcf2adad9651735e1",
|
||||
"/js/theme-monokai.js": "/js/theme-monokai.js?id=8842103833ba4861bcfa",
|
||||
"/js/timeline.js": "/js/timeline.js?id=4e850413d00bf72d2a89"
|
||||
"/js/timeline.js": "/js/timeline.js?id=e931e2fe46892a0b4875"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,55 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="card rounded-0 border-top-0 status-card card-md-rounded-0 shadow-none border">
|
||||
<div v-if="status.pf_type === 'text'" class="card shadow-none border border-top-0 rounded-0">
|
||||
<div class="card-body">
|
||||
<div class="media">
|
||||
<img class="rounded-circle box-shadow mr-2" :src="status.account.avatar" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar">
|
||||
<div class="media-body">
|
||||
<div class="pl-2 d-flex align-items-top">
|
||||
<a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)">
|
||||
Loading...
|
||||
</a>
|
||||
<span class="px-1 text-lighter">
|
||||
·
|
||||
</span>
|
||||
<a class="font-weight-bold text-lighter"
|
||||
:href="statusUrl(status)">
|
||||
{{shortTimestamp(status.created_at)}}
|
||||
</a>
|
||||
<span class="text-right" style="flex-grow:1;">
|
||||
<button class="btn btn-link text-dark py-0" type="button" @click="ctxMenu()">
|
||||
<span class="fas fa-ellipsis-v text-lighter"></span>
|
||||
<span class="sr-only">Post Menu</span>
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
<div class="pl-2">
|
||||
|
||||
<details v-if="status.sensitive">
|
||||
<summary class="mb-2 font-weight-bold text-muted">Content Warning</summary>
|
||||
<p v-html="status.content" class="pt-2 text-break" style="font-size: 17px;"></p>
|
||||
</details>
|
||||
|
||||
<p v-else v-html="status.content" class="pt-2 text-break" style="font-size: 17px;"></p>
|
||||
|
||||
<p class="mb-0">
|
||||
<i class="fa-heart fa-lg cursor-pointer mr-3"
|
||||
:class="{ 'far text-muted': !status.favourited, 'fas text-danger': status.favourited }"
|
||||
@click="likeStatus(status, $event);">
|
||||
</i>
|
||||
|
||||
<i class="far fa-comment cursor-pointer text-muted fa-lg mr-3"
|
||||
@click="commentFocus(status, $event)">
|
||||
|
||||
</i>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-else class="card rounded-0 border-top-0 status-card card-md-rounded-0 shadow-none border">
|
||||
<div v-if="status" class="card-header d-inline-flex align-items-center bg-white">
|
||||
<div>
|
||||
<img class="rounded-circle box-shadow" :src="status.account.avatar" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar">
|
||||
|
|
@ -27,15 +76,7 @@
|
|||
|
||||
<div class="postPresenterContainer" style="background: #000;">
|
||||
|
||||
<div v-if="config.ab.top && status.pf_type === 'text'" class="w-100">
|
||||
<div class="w-100 card-img-top border-bottom rounded-0" style="background-image: url(/storage/textimg/bg_1.jpg);background-size: cover;width: 100%;height: 540px;">
|
||||
<div class="w-100 h-100 d-flex justify-content-center align-items-center">
|
||||
<p class="text-center text-break h3 px-5 font-weight-bold" v-html="status.content"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-else-if="status.pf_type === 'photo'" class="w-100">
|
||||
<div v-if="status.pf_type === 'photo'" class="w-100">
|
||||
<photo-presenter :status="status" v-on:lightbox="lightbox" v-on:togglecw="status.sensitive = false"></photo-presenter>
|
||||
</div>
|
||||
|
||||
|
|
@ -200,6 +241,10 @@
|
|||
return ts.toDateString() + ' ' + ts.toLocaleTimeString();
|
||||
},
|
||||
|
||||
shortTimestamp(ts) {
|
||||
return window.App.util.format.timeAgo(ts);
|
||||
},
|
||||
|
||||
statusCardUsernameFormat(status) {
|
||||
if(status.account.local == true) {
|
||||
return status.account.username;
|
||||
|
|
|
|||
Loading…
Reference in New Issue