TheCloud/PronounsPage
1
0
Fork 0
mirror of https://gitlab.com/PronounsPage/PronounsPage.git synced 2025-09-18 03:55:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

#82 [nouns] pagination - extract Table component

Browse Source
This commit is contained in:
Andrea Vos 2020-10-29 23:23:16 +01:00
parent 6336fbd845
commit e6f18a1491
3 changed files with 236 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
components/Table.vue Normal file
View File

@ -0,0 +1,104 @@
<template>
<section class="table-responsive">
<table :class="'table table-striped table-hover table-fixed-' + columns">
<thead ref="thead">
<tr>
<slot name="header"></slot>
</tr>
</thead>
<tbody>
<template v-if="data.length">
<tr v-for="el in dataPage" :key="el[rowKey]" :class="{'marked': marked ? marked(el) : false}">
<slot name="row" v-bind:el="el"></slot>
</tr>
</template>
<template v-else>
<tr>
<td :colspan="columns" class="text-center">
<slot name="empty">
<Icon v="search"/>
<T>table.empty</T>
</slot>
</td>
</tr>
</template>
</tbody>
<tfoot v-if="pages > 1">
<tr>
<td :colspan="columns">
<nav>
<ul class="pagination pagination-sm justify-content-center">
<li v-for="p in pagesRange" :class="['page-item', p.page === page ? 'active' : '', p.enabled ? '' : 'disabled']">
<a v-if="p.enabled" class="page-link" href="#" @click.prevent="page = p.page">
{{p.text}}
</a>
<span v-else class="page-link">
{{p.text}}
</span>
</li>
</ul>
</nav>
</td>
</tr>
</tfoot>
</table>
</section>
</template>
<script>
export default {
props: {
data: { required: true },
columns: { required: true },
perPage: { 'default': 30 },
rowKey: { 'default': 'id' },
marked: {},
},
data() {
return {
page: 0,
};
},
computed: {
dataPage() {
return this.data.slice(this.page * this.perPage, (this.page + 1) * this.perPage);
},
pages() {
return Math.ceil(this.data.length / this.perPage);
},
pagesRange() {
const vPages = [];
vPages.push({page: 0, text: '«', enabled: this.page > 0});
vPages.push({page: this.page - 1, text: '‹', enabled: this.page > 0});
for (let i = 0; i < this.pages; i++) {
if (i <= 4 || (this.page - 3 <= i && i <= this.page + 3) || i >= this.pages - 3) {
vPages.push({page: i, text: i + 1, enabled: true});
} else if (vPages[vPages.length - 1].text !== '…') {
vPages.push({text: '…', enabled: false});
}
}
vPages.push({page: this.page + 1, text: '›', enabled: this.page < this.pages - 1});
vPages.push({page: this.pages - 1, text: '»', enabled: this.page < this.pages - 1});
return vPages;
},
},
methods: {
reset() {
this.page = 0;
},
focus() {
setTimeout(_ => {
this.$refs.thead.scrollIntoView();
}, 300);
},
},
}
</script>
<style lang="scss">
@import "assets/style";
.marked {
border-left: 3px solid $primary;
}
</style>

3
locale/pl/translations.suml
View File

@ -744,3 +744,6 @@ terms:
header: 'Regulamin' header: 'Regulamin'
lastUpdate: 'Ostatnia aktualizacja' lastUpdate: 'Ostatnia aktualizacja'
consent: 'Zakładając konto, akceptujesz' consent: 'Zakładając konto, akceptujesz'
table:
empty: 'Pusto…'

146
routes/nouns.vue
View File

@ -23,8 +23,8 @@
<Loading :value="nounsRaw"> <Loading :value="nounsRaw">
<section v-if="$admin()" class="px-3"> <section v-if="$admin()" class="px-3">
<div class="alert alert-info"> <div class="alert alert-info">
<strong>{{ nounsCountApproved }}</strong> <T>nouns.approved</T>, <strong>{{ nounsCountApproved() }}</strong> <T>nouns.approved</T>,
<strong>{{ nounsCountPending }}</strong> <T>nouns.pending</T>. <strong>{{ nounsCountPending() }}</strong> <T>nouns.pending</T>.
</div> </div>
</section> </section>
@ -50,10 +50,8 @@
</div> </div>
</section> </section>
<section class="table-responsive"> <Table :data="visibleNouns()" :columns="$admin() ? 4 : 3" :marked="(el) => !el.approved" ref="dictionarytable">
<table :class="'table table-striped table-hover table-fixed-' + ($admin() ? 4 : 3)"> <template v-slot:header>
<thead ref="thead" id="thead">
<tr>
<th class="text-nowrap"> <th class="text-nowrap">
<Icon v="mars"/> <Icon v="mars"/>
<T>nouns.masculine</T> <T>nouns.masculine</T>
@ -67,133 +65,107 @@
<T>nouns.neuter</T> <T>nouns.neuter</T>
</th> </th>
<th v-if="$admin()"></th> <th v-if="$admin()"></th>
</tr> </template>
</thead>
<tbody> <template v-slot:row="s">
<template v-if="visibleNouns.length">
<tr v-for="noun in visibleNounsPage" :class="{'mark-left': !noun.approved}" :key="noun.id">
<td> <td>
<ul class="list-singular"> <ul class="list-singular">
<li v-for="w in noun.masc">{{ w }}</li> <li v-for="w in s.el.masc">{{ w }}</li>
</ul> </ul>
<ul class="list-plural"> <ul class="list-plural">
<li v-for="w in noun.mascPl">{{ w }}</li> <li v-for="w in s.el.mascPl">{{ w }}</li>
</ul> </ul>
<small v-if="noun.base && nouns[noun.base]"> <small v-if="s.el.base && nouns[s.el.base]">
<p><strong><T>nouns.edited</T>:</strong></p> <p><strong><T>nouns.edited</T>:</strong></p>
<ul class="list-singular"> <ul class="list-singular">
<li v-for="w in nouns[noun.base].masc">{{ w }}</li> <li v-for="w in nouns[s.el.base].masc">{{ w }}</li>
</ul> </ul>
<ul class="list-plural"> <ul class="list-plural">
<li v-for="w in nouns[noun.base].mascPl">{{ w }}</li> <li v-for="w in nouns[s.el.base].mascPl">{{ w }}</li>
</ul> </ul>
</small> </small>
<button v-if="!$admin()" class="btn btn-outline-primary btn-sm m-1 hover-show" @click="edit(noun)"> <button v-if="!$admin()" class="btn btn-outline-primary btn-sm m-1 hover-show" @click="edit(s.el)">
<Icon v="pen"/> <Icon v="pen"/>
<T>nouns.edit</T> <T>nouns.edit</T>
</button> </button>
</td> </td>
<td> <td>
<ul class="list-singular"> <ul class="list-singular">
<li v-for="w in noun.fem">{{ w }}</li> <li v-for="w in s.el.fem">{{ w }}</li>
</ul> </ul>
<ul class="list-plural"> <ul class="list-plural">
<li v-for="w in noun.femPl">{{ w }}</li> <li v-for="w in s.el.femPl">{{ w }}</li>
</ul> </ul>
<small v-if="noun.base && nouns[noun.base]"> <small v-if="s.el.base && nouns[s.el.base]">
<p><strong><T>nouns.edited</T>:</strong></p> <p><strong><T>nouns.edited</T>:</strong></p>
<ul class="list-singular"> <ul class="list-singular">
<li v-for="w in nouns[noun.base].fem">{{ w }}</li> <li v-for="w in nouns[s.el.base].fem">{{ w }}</li>
</ul> </ul>
<ul class="list-plural"> <ul class="list-plural">
<li v-for="w in nouns[noun.base].femPl">{{ w }}</li> <li v-for="w in nouns[s.el.base].femPl">{{ w }}</li>
</ul> </ul>
</small> </small>
</td> </td>
<td> <td>
<ul class="list-singular"> <ul class="list-singular">
<li v-for="w in noun.neutr"> <li v-for="w in s.el.neutr">
<Declension :word="w"/> <Declension :word="w"/>
</li> </li>
</ul> </ul>
<ul class="list-plural"> <ul class="list-plural">
<li v-for="w in noun.neutrPl"> <li v-for="w in s.el.neutrPl">
<Declension :word="w" plural :singularOptions="noun.neutr"/> <Declension :word="w" plural :singularOptions="s.el.neutr"/>
</li> </li>
</ul> </ul>
<small v-if="noun.base && nouns[noun.base]"> <small v-if="s.el.base && nouns[s.el.base]">
<p><strong><T>nouns.edited</T>:</strong></p> <p><strong><T>nouns.edited</T>:</strong></p>
<ul class="list-singular"> <ul class="list-singular">
<li v-for="w in nouns[noun.base].neutr">{{ w }}</li> <li v-for="w in nouns[s.el.base].neutr">{{ w }}</li>
</ul> </ul>
<ul class="list-plural"> <ul class="list-plural">
<li v-for="w in nouns[noun.base].neutrPl">{{ w }}</li> <li v-for="w in nouns[s.el.base].neutrPl">{{ w }}</li>
</ul> </ul>
</small> </small>
</td> </td>
<td v-if="$admin()"> <td v-if="$admin()">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li v-if="!noun.approved"> <li v-if="!s.el.approved">
<button class="btn btn-success btn-sm m-1" @click="approve(noun)"> <button class="btn btn-success btn-sm m-1" @click="approve(s.el)">
<Icon v="check"/> <Icon v="check"/>
<T>crud.approve</T> <T>crud.approve</T>
</button> </button>
</li> </li>
<li v-else @click="hide(noun)"> <li v-else @click="hide(s.el)">
<button class="btn btn-outline-secondary btn-sm m-1"> <button class="btn btn-outline-secondary btn-sm m-1">
<Icon v="times"/> <Icon v="times"/>
<T>crud.hide</T> <T>crud.hide</T>
</button> </button>
</li> </li>
<li> <li>
<button class="btn btn-outline-danger btn-sm m-1" @click="remove(noun)"> <button class="btn btn-outline-danger btn-sm m-1" @click="remove(s.el)">
<Icon v="trash"/> <Icon v="trash"/>
<T>crud.remove</T> <T>crud.remove</T>
</button> </button>
</li> </li>
<li> <li>
<button class="btn btn-outline-primary btn-sm m-1" @click="edit(noun)"> <button class="btn btn-outline-primary btn-sm m-1" @click="edit(s.el)">
<Icon v="pen"/> <Icon v="pen"/>
<T>crud.edit</T> <T>crud.edit</T>
</button> </button>
</li> </li>
</ul> </ul>
</td> </td>
</tr>
</template> </template>
<template v-else>
<tr> <template v-slot:empty>
<td :colspan="$admin() ? 4 : 3" class="text-center">
<Icon v="search"/> <Icon v="search"/>
<T>nouns.empty</T> <T>nouns.empty</T>
</td>
</tr>
</template> </template>
</tbody> </Table>
<tfoot v-if="pages > 1">
<tr>
<td :colspan="$admin() ? 4 : 3">
<nav>
<ul class="pagination pagination-sm justify-content-center">
<li v-for="p in pagesRange" :class="['page-item', p.page === page ? 'active' : '', p.enabled ? '' : 'disabled']">
<a v-if="p.enabled" class="page-link" href="#" @click.prevent="page = p.page">
{{p.text}}
</a>
<span v-else class="page-link">
{{p.text}}
</span>
</li>
</ul>
</nav>
</td>
</tr>
</tfoot>
</table>
</section>
<Separator icon="plus"/> <Separator icon="plus"/>
@ -221,7 +193,6 @@
return { return {
filter: '', filter: '',
nounsRaw: undefined, nounsRaw: undefined,
page: 0,
} }
}, },
mounted() { mounted() {
@ -278,6 +249,17 @@
delete this.nouns[noun.id]; delete this.nouns[noun.id];
this.$forceUpdate(); this.$forceUpdate();
}, },
// those must be methods, not computed, because when modified, they don't get updated in the view for some reason
visibleNouns() {
return Object.values(this.nouns).filter(n => n.matches(this.filter));
},
nounsCountApproved() {
return Object.values(this.nouns).filter(n => n.approved).length;
},
nounsCountPending() {
return Object.values(this.nouns).filter(n => !n.approved).length;
},
}, },
computed: { computed: {
nouns() { nouns() {
@ -300,36 +282,6 @@
} }
}, this); }, this);
}, },
visibleNouns() {
return Object.values(this.nouns).filter(n => n.matches(this.filter));
},
visibleNounsPage() {
return this.visibleNouns.slice(this.page * PER_PAGE, (this.page + 1) * PER_PAGE);
},
pages() {
return Math.ceil(this.visibleNouns.length / PER_PAGE);
},
pagesRange() {
const vPages = [];
vPages.push({page: 0, text: '«', enabled: this.page > 0});
vPages.push({page: this.page - 1, text: '‹', enabled: this.page > 0});
for (let i = 0; i < this.pages; i++) {
if (i <= 4 || (this.page - 3 <= i && i <= this.page + 3) || i >= this.pages - 3) {
vPages.push({page: i, text: i + 1, enabled: true});
} else if (vPages[vPages.length - 1].text !== '…') {
vPages.push({text: '…', enabled: false});
}
}
vPages.push({page: this.page + 1, text: '›', enabled: this.page < this.pages - 1});
vPages.push({page: this.pages - 1, text: '»', enabled: this.page < this.pages - 1});
return vPages;
},
nounsCountApproved() {
return Object.values(this.nouns).filter(n => n.approved).length;
},
nounsCountPending() {
return Object.values(this.nouns).filter(n => !n.approved).length;
},
}, },
watch: { watch: {
filter() { filter() {
@ -339,12 +291,10 @@
} else { } else {
history.pushState('', document.title, window.location.pathname + window.location.search); history.pushState('', document.title, window.location.pathname + window.location.search);
} }
this.page = 0; if (this.$refs.dictionarytable) {
setTimeout(_ => { this.$refs.dictionarytable.reset();
if (this.$refs.thead) { this.$refs.dictionarytable.focus();
this.$refs.thead.scrollIntoView();
} }
}, 300);
} }
} }
}, },
@ -388,10 +338,6 @@
} }
} }
.mark-left {
border-left: 3px solid $primary;
}
tr { tr {
.hover-show { .hover-show {
opacity: 0; opacity: 0;