skeh
/
misskey
1
0
Fork 0
Code Issues 2 Pull Requests Releases Activity

feature/rich_welcome_content #1

Merged
skeh merged 2 commits from feature/rich_welcome_content into stage 2021-06-27 05:32:47 +00:00
Conversation 0 Commits 2 Files Changed 2 +32 -8
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7efa3c724d - Show all commits

11
src/client/components/poll.vue
View File

@ -10,7 +10,7 @@
</span> </span>
</li> </li>
</ul> </ul>
<p> <p v-if="!readOnly">
<span>{{ $t('_poll.totalVotes', { n: total }) }}</span> <span>{{ $t('_poll.totalVotes', { n: total }) }}</span>
<span> · </span> <span> · </span>
<a v-if="!closed && !isVoted" @click="toggleShowResult">{{ showResult ? $ts._poll.vote : $ts._poll.showResult }}</a> <a v-if="!closed && !isVoted" @click="toggleShowResult">{{ showResult ? $ts._poll.vote : $ts._poll.showResult }}</a>
@ -31,6 +31,11 @@ export default defineComponent({
note: { note: {
type: Object, type: Object,
required: true required: true
},
readOnly: {
type: Boolean,
required: false,
default: false,
} }
}, },
data() { data() {
@ -65,7 +70,7 @@ export default defineComponent({
} }
}, },
created() { created() {
this.showResult = this.isVoted; this.showResult = this.readOnly || this.isVoted;
if (this.note.poll.expiresAt) { if (this.note.poll.expiresAt) {
const update = () => { const update = () => {
@ -83,7 +88,7 @@ export default defineComponent({
this.showResult = !this.showResult; this.showResult = !this.showResult;
}, },
vote(id) { vote(id) {
if (this.closed || !this.poll.multiple && this.poll.choices.some(c => c.isVoted)) return; if (this.readOnly || this.closed || !this.poll.multiple && this.poll.choices.some(c => c.isVoted)) return;
os.api('notes/polls/vote', { os.api('notes/polls/vote', {
noteId: this.note.id, noteId: this.note.id,
choice: id choice: id

23
src/client/pages/welcome.timeline.vue
View File

@ -1,22 +1,38 @@
<template> <template>
<div class="civpbkhh"> <div class="civpbkhh">
<div class="scrollbox" ref="scroll" v-bind:class="{ scroll: isScrolling }">
<div v-for="note in notes" class="note"> <div v-for="note in notes" class="note">
<div class="content _panel"> <div class="content _panel">
{{ note.text }} <div class="body">
<MkA class="reply" v-if="note.replyId" :to="`/notes/${note.replyId}`"><i class="fas fa-reply"></i></MkA>
<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
<MkA class="rp" v-if="note.renoteId" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
</div>
<div v-if="note.files.length > 0" class="richcontent">
<XMediaList :media-list="note.files"/>
</div>
<div v-if="note.poll">
<XPoll :note="note" :readOnly="true" />
</div>
</div> </div>
<XReactionsViewer :note="note" ref="reactionsViewer"/> <XReactionsViewer :note="note" ref="reactionsViewer"/>
</div> </div>
</div> </div>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import XReactionsViewer from '@client/components/reactions-viewer.vue'; import XReactionsViewer from '@client/components/reactions-viewer.vue';
import XMediaList from '@client/components/media-list.vue';
import XPoll from '@client/components/poll.vue';
import * as os from '@client/os'; import * as os from '@client/os';
export default defineComponent({ export default defineComponent({
components: { components: {
XReactionsViewer XReactionsViewer,
XMediaList,
XPoll
}, },
data() { data() {
@ -45,6 +61,9 @@ export default defineComponent({
margin: 0 0 0 auto; margin: 0 0 0 auto;
max-width: max-content; max-width: max-content;
border-radius: 16px; border-radius: 16px;
> .richcontent {
min-width: 250px;
}
} }
} }
} }