Oneric/admin-fe
1
0
Fork 0
forked from AkkomaGang/admin-fe
Code Pull requests Activity

Remove checkboxes from statuses where they are not used

Browse source
This commit is contained in:
Angelina Filippova 2020-01-31 22:12:00 +03:00
parent 643eb55e67
commit 74018751e8
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/Status/index.vue
View file

@ -5,10 +5,9 @@
<div class="status-header"> <div class="status-header">
<div class="status-account-container"> <div class="status-account-container">
<div class="status-account"> <div class="status-account">
<el-checkbox @change="handleStatusSelection(status.account)"> <el-checkbox v-if="showCheckbox" class="status-checkbox" @change="handleStatusSelection(status.account)"/>
<img :src="status.account.avatar" class="status-avatar-img"> <img :src="status.account.avatar" class="status-avatar-img">
<h3 class="status-account-name">{{ status.account.display_name }}</h3> <h3 class="status-account-name">{{ status.account.display_name }}</h3>
</el-checkbox>
</div> </div>
<a :href="status.account.url" target="_blank" class="account"> <a :href="status.account.url" target="_blank" class="account">
@{{ status.account.acct }} @{{ status.account.acct }}
@ -122,6 +121,11 @@ import moment from 'moment'
export default { export default {
name: 'Status', name: 'Status',
props: { props: {
showCheckbox: {
type: Boolean,
required: true,
default: false
},
status: { status: {
type: Object, type: Object,
required: true required: true
@ -224,6 +228,9 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.status-checkbox {
margin-right: 7px;
}
.status-content { .status-content {
font-size: 15px; font-size: 15px;
line-height: 26px; line-height: 26px;

2
src/views/reports/components/Report.vue
View file

@ -58,7 +58,7 @@
<el-collapse> <el-collapse>
<el-collapse-item :title="getStatusesTitle(report.statuses)"> <el-collapse-item :title="getStatusesTitle(report.statuses)">
<div v-for="status in report.statuses" :key="status.id"> <div v-for="status in report.statuses" :key="status.id">
<status :status="status" :page="currentPage"/> <status :status="status" :show-checkbox="false" :page="currentPage"/>
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>

5
src/views/statuses/index.vue
View file

@ -22,7 +22,7 @@
@apply-action="clearSelection"/> @apply-action="clearSelection"/>
</div> </div>
<div v-for="status in statuses" :key="status.id" class="status-container"> <div v-for="status in statuses" :key="status.id" class="status-container">
<status :status="status" @status-selection="handleStatusSelection" /> <status :status="status" :show-checkbox="isDesktop" @status-selection="handleStatusSelection" />
</div> </div>
<div v-if="statuses.length > 0" class="statuses-pagination"> <div v-if="statuses.length > 0" class="statuses-pagination">
<el-button @click="handleLoadMore">{{ $t('statuses.loadMore') }}</el-button> <el-button @click="handleLoadMore">{{ $t('statuses.loadMore') }}</el-button>
@ -54,6 +54,9 @@ export default {
'instances', 'instances',
'statuses' 'statuses'
]), ]),
isDesktop() {
return this.$store.state.app.device === 'desktop'
},
loadingPeers() { loadingPeers() {
return this.$store.state.peers.loading return this.$store.state.peers.loading
} }

2
src/views/users/show.vue
View file

@ -92,7 +92,7 @@
<el-col :span="16"> <el-col :span="16">
<el-timeline v-if="!statusesLoading" class="statuses"> <el-timeline v-if="!statusesLoading" class="statuses">
<el-timeline-item v-for="status in statuses" :key="status.id"> <el-timeline-item v-for="status in statuses" :key="status.id">
<status :status="status" :user-id="user.id" :godmode="showPrivate"/> <status :status="status" :show-checkbox="false" :user-id="user.id" :godmode="showPrivate"/>
</el-timeline-item> </el-timeline-item>
<p v-if="statuses.length === 0" class="no-statuses">{{ $t('userProfile.noStatuses') }}</p> <p v-if="statuses.length === 0" class="no-statuses">{{ $t('userProfile.noStatuses') }}</p>
</el-timeline> </el-timeline>