diff --git a/CHANGELOG b/CHANGELOG
index 4126850f..7bacb35b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file.
- fix AP resource removal
- improve AP resource UI
-
+ - fix Docker setup
+ - update deps
### 1.0 (alpha)
This release is a complete rewrite of frontend UI and many internals, main changes are:
diff --git a/components/admin/Moderation.vue b/components/admin/Moderation.vue
index 01184f17..738ae85e 100644
--- a/components/admin/Moderation.vue
+++ b/components/admin/Moderation.vue
@@ -13,8 +13,7 @@
dense :headers='instancesHeader'
@click:row='instanceSelected')
template(v-slot:item.blocked="{ item }")
- v-icon(v-if='item.blocked') mdi-checkbox-intermediate
- v-icon(v-else) mdi-checkbox-blank-outline
+ v-icon(@click='toggleBlock(item)') {{item.blocked ? 'mdi-checkbox-intermediate' : 'mdi-checkbox-blank-outline'}}
v-col(:span='11')
span {{$t('common.users')}}
@@ -24,49 +23,39 @@
:search='usersFilter'
:hide-default-footer='users.length<5'
dense :headers='usersHeader')
- //- template(v-slot:item.username="{item}")
- //- a(:href='item.ap_id') {{item.object.preferredUsername}}
- //- el-table-column(:label="$t('common.user')" width='150')
- //- template(slot-scope='data')
- //- span(slot='reference')
- //- a(:href='data.row.object.id' target='_blank') {{data.row.object.name}}
- //- small ({{data.row.object.preferredUsername}})
- //- el-table-column(:label="$t('common.resources')" width='90')
- //- template(slot-scope='data')
- //- span {{data.row.resources.length}}
- //- el-table-column(:label="$t('common.actions')" width='200')
- //- template(slot-scope='data')
- //- el-button-group
- //- el-button(size='mini'
- //- :type='data.row.blocked?"danger":"warning"'
- //- @click='toggleUserBlock(data.row)') {{data.row.blocked?$t('admin.unblock'):$t('admin.block')}}
+ template(v-slot:item.blocked="{ item }")
+ v-icon(@click='toggleUserBlock(item)') {{item.blocked?'mdi-checkbox-intermediate':'mdi-checkbox-blank-outline'}}
div
v-card-title {{$t('common.resources')}}
- v-data-table(:items='resources'
+ v-data-table(:items='resources' dense
+ :headers='resourcesHeader'
:hide-default-footer='resources.length<10'
- )
- //- el-table-column(:label="$t('common.event')")
- //- template(slot-scope='data')
- //- span {{data.row.event}}
- //- el-table-column(:label="$t('common.resources')")
- //- template(slot-scope='data')
- //- span(:class='{disabled: data.row.hidden}' v-html='data.row.data.content')
- //- el-table-column(:label="$t('common.user')" width='200')
- //- template(slot-scope='data')
- //- span(:class='{disabled: data.row.hidden}' v-html='data.row.data.actor')
- //- el-table-column(:label="$t('common.actions')" width="150")
- //- template(slot-scope='data')
- //- el-dropdown
- //- el-button(type="primary" icon="el-icon-arrow-down" size='mini') {{$t('common.moderation')}}
- //- el-dropdown-menu(slot='dropdown')
- //- el-dropdown-item(v-if='!data.row.hidden' icon='el-icon-remove' @click.native='hideResource(data.row, true)') {{$t('admin.hide_resource')}}
- //- el-dropdown-item(v-else icon='el-icon-success' @click.native='hideResource(data.row, false)') {{$t('admin.show_resource')}}
- //- el-dropdown-item(icon='el-icon-delete' @click.native='deleteResource(data.row)') {{$t('admin.delete_resource')}}
- //- el-dropdown-item(icon='el-icon-lock' @click.native='toggleUserBlock(data.row.ap_user)') {{$t('admin.block_user')}}
+ :items-per-page='10')
+ template(v-slot:item.content='{ item }')
+ span(v-html='item.data.content')
+ template(v-slot:item.user='{ item }')
+ span {{item.ap_user.preferredUsername}}
+ template(v-slot:item.event='{ item }')
+ span {{item.event.title}}
+ template(v-slot:item.actions='{ item }')
+ v-menu(offset-y)
+ template(v-slot:activator="{ on }")
+ v-btn.mr-2(v-on='on' color='primary' small icon)
+ v-icon mdi-dots-vertical
+ v-list
+ v-list-item(v-if='!item.hidden' @click='hideResource(item, true)')
+ v-list-item-title mdi-eye-off {{$t('admin.hide_resource')}}
+ v-list-item(v-else @click='hideResource(item, false)')
+ v-list-item-title mdi-eye {{$t('admin.show_resource')}}
+ v-list-item(@click='deleteResource(item)')
+ v-list-item-title mdi-delete {{$t('admin.delete_resource')}}
+ //- v-list-item(@click='toggleUserBlock(item.ap_user)')
+ //- v-list-item-title mdi-lock {{$t('admin.block_user')}}