encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
les
2020-01-21 01:17:45 +01:00
parent d834fb4206
commit c74eb99c7b
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/Editor.vue
View File

@@ -69,7 +69,6 @@ export default {
} }
}, },
mounted () { mounted () {
console.error('dentro mounted di editor!')
this.editor = new Editor({ this.editor = new Editor({
onUpdate: _.debounce(({ getHTML }) => this.$emit('input', getHTML()), 300), onUpdate: _.debounce(({ getHTML }) => this.$emit('input', getHTML()), 300),
content: this.value, content: this.value,

4
components/Home.vue
View File

@@ -9,8 +9,8 @@
Search(past-filter recurrent-filter) Search(past-filter recurrent-filter)
.row.m-0 .row.m-0
.p-0.col-sm-6.col-lg-4.col-xl-4(v-for='event in events' :key='event.id') .p-0.col-sm-6.col-lg-4.col-xl-4(v-for='event in events' :key='event.id + event.start_datetime')
a.d-block.d-sm-none.sticky(:id='event.newDay' v-if='event.newDay') a.d-block.d-sm-none(:id='event.newDay' v-if='event.newDay')
el-divider {{event.start_datetime|day}} el-divider {{event.start_datetime|day}}
Event( Event(
:id='event.start_datetime' :id='event.start_datetime'

17
components/Search.vue
View File

@@ -17,7 +17,7 @@
v-model='showPast' v-model='showPast'
) )
el-autocomplete.mb-1#search.inline-input(placeholder='Cerca' prefix-icon='el-icon-search' el-autocomplete.mb-1#search.inline-input(:placeholder='$t("common.filter")' prefix-icon='el-icon-search'
highlight-first-item highlight-first-item
v-model='search' :debounce='200' v-model='search' :debounce='200'
:fetch-suggestions='querySearch' clearable :fetch-suggestions='querySearch' clearable
@@ -27,7 +27,7 @@
i.float-right.el-icon-place(v-if='item.type==="place"') i.float-right.el-icon-place(v-if='item.type==="place"')
i.float-right.el-icon-collection-tag(v-if='item.type==="tag"') i.float-right.el-icon-collection-tag(v-if='item.type==="tag"')
br br
el-tag.mr-1(type='success' v-for='f in filter' el-tag.mr-1(type='success' v-for='f in filter' size='small'
disable-transitions closable :key='f.type + f.id' disable-transitions closable :key='f.type + f.id'
@close='removeFilter(f)') {{f.label}} @close='removeFilter(f)') {{f.label}}
</template> </template>
@@ -49,9 +49,10 @@ export default {
...mapState(['tags', 'places', 'filters', 'settings']), ...mapState(['tags', 'places', 'filters', 'settings']),
// TOFIX: optimize // TOFIX: optimize
keywords () { keywords () {
const tags = this.tags.map(t => ({ type: 'tag', label: t, weigth: t.weigth, id: t })) const tags = this.tags.map(t => ({ type: 'tag', label: t.tag, weigth: t.weigth, id: t.tag }))
const places = this.places.map(p => ({ type: 'place', label: p.name, weigth: p.weigth, id: p.id })) const places = this.places.map(p => ({ type: 'place', label: p.name, weigth: p.weigth, id: p.id }))
return tags.concat(places).sort((a, b) => b.weigth - a.weigth) const keywords = tags.concat(places).sort((a, b) => b.weigth - a.weigth)
return keywords
}, },
showPast: { showPast: {
set (value) { this.showPastEvents(value) }, set (value) { this.showPastEvents(value) },
@@ -62,15 +63,7 @@ export default {
get () { return this.filters.show_recurrent_events } get () { return this.filters.show_recurrent_events }
}, },
filter () { filter () {
// set (filters) {
// const tags = filters.filter(f => f[0] === 't').map(t => t.slice(1))
// this.setSearchTags(tags)
// const places = filters.filter(f => f[0] === 'p').map(p => +p.slice(1))
// this.setSearchPlaces(places)
// },
// get () {
return this.filters.tags.concat(this.filters.places) return this.filters.tags.concat(this.filters.places)
// }
} }
}, },
methods: { methods: {

13
components/admin/Federation.vue
View File

@@ -65,7 +65,7 @@
:type='data.row.blocked?"danger":"warning"' :type='data.row.blocked?"danger":"warning"'
@click='toggleUserBlock(data.row)') {{data.row.blocked?$t('admin.unblock'):$t('admin.block')}} @click='toggleUserBlock(data.row)') {{data.row.blocked?$t('admin.unblock'):$t('admin.block')}}
//- div(v-show='enable_federation') div(v-show='enable_federation')
el-divider {{$t('common.resources')}} el-divider {{$t('common.resources')}}
el-table(:data='paginatedResources' small :row-style='resourceStyle') el-table(:data='paginatedResources' small :row-style='resourceStyle')
el-table-column(:label="$t('common.event')") el-table-column(:label="$t('common.event')")
@@ -86,7 +86,7 @@
</template> </template>
<script> <script>
import { mapState, mapActions, mapGetters } from 'vuex' import { mapState, mapActions } from 'vuex'
export default { export default {
name: 'Federation', name: 'Federation',
@@ -141,14 +141,13 @@ export default {
}, },
filteredUsers () { filteredUsers () {
if (!this.usersFilter) { return this.users } if (!this.usersFilter) { return this.users }
this.usersFilter = this.usersFilter.toLowerCase() const usersFilter = this.usersFilter.toLowerCase()
console.error(this.users) return this.users.filter(user => user.name.includes(usersFilter) || user.preferredName.includes(usersFilter))
return this.users.filter(user => user.name.includes(this.usersFilter) || user.preferredName.includes(this.usersFilter))
}, },
filteredInstances () { filteredInstances () {
if (!this.instancesFilter) { return this.instances } if (!this.instancesFilter) { return this.instances }
this.instancesFilter = this.instancesFilter.toLowerCase() const instancesFilter = this.instancesFilter.toLowerCase()
return this.instances.filter(instance => instance.name.includes(this.instancesFilter) || instance.domain.includes(this.instancesFilter)) return this.instances.filter(instance => instance.name.includes(instancesFilter) || instance.domain.includes(instancesFilter))
}, },
paginatedSelectedUsers () { paginatedSelectedUsers () {
return this.filteredUsers.slice((this.userPage - 1) * this.perPage, return this.filteredUsers.slice((this.userPage - 1) * this.perPage,