DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #6566 (#6577)

This commit is contained in:
tamaina 2020-07-23 13:07:27 +09:00 committed by GitHub
parent 58f7af8927
commit b8350d5093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/client/components/deck/direct-column.vue
View File

@ -2,20 +2,21 @@
<x-column :name="name" :column="column" :is-stacked="isStacked" :menu="menu"> <x-column :name="name" :column="column" :is-stacked="isStacked" :menu="menu">
<template #header><fa :icon="faEnvelope" style="margin-right: 8px;"/>{{ column.name }}</template> <template #header><fa :icon="faEnvelope" style="margin-right: 8px;"/>{{ column.name }}</template>
<x-direct/> <x-notes :pagination="pagination" @before="before()" @after="after()"/>
</x-column> </x-column>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { faEnvelope } from '@fortawesome/free-solid-svg-icons'; import { faEnvelope } from '@fortawesome/free-solid-svg-icons';
import Progress from '../../scripts/loading';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XDirect from '../../pages/messages.vue'; import XNotes from '../notes.vue';
export default Vue.extend({ export default Vue.extend({
components: { components: {
XColumn, XColumn,
XDirect XNotes
}, },
props: { props: {
@ -32,8 +33,25 @@ export default Vue.extend({
data() { data() {
return { return {
menu: null, menu: null,
pagination: {
endpoint: 'notes/mentions',
limit: 10,
params: () => ({
visibility: 'specified'
})
},
faEnvelope faEnvelope
} }
}, },
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
}); });
</script> </script>

21
src/client/components/deck/mentions-column.vue
View File

@ -2,20 +2,21 @@
<x-column :column="column" :is-stacked="isStacked" :menu="menu"> <x-column :column="column" :is-stacked="isStacked" :menu="menu">
<template #header><fa :icon="faAt" style="margin-right: 8px;"/>{{ column.name }}</template> <template #header><fa :icon="faAt" style="margin-right: 8px;"/>{{ column.name }}</template>
<x-mentions/> <x-notes :pagination="pagination" @before="before()" @after="after()"/>
</x-column> </x-column>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { faAt } from '@fortawesome/free-solid-svg-icons'; import { faAt } from '@fortawesome/free-solid-svg-icons';
import Progress from '../../scripts/loading';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XMentions from '../../pages/mentions.vue'; import XNotes from '../notes.vue';
export default Vue.extend({ export default Vue.extend({
components: { components: {
XColumn, XColumn,
XMentions XNotes
}, },
props: { props: {
@ -32,8 +33,22 @@ export default Vue.extend({
data() { data() {
return { return {
menu: null, menu: null,
pagination: {
endpoint: 'notes/mentions',
limit: 10,
},
faAt faAt
} }
}, },
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
}); });
</script> </script>