From 3321f94cd3260d7ea97828dd36d23de9a4cbaf8a Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 29 Oct 2020 17:56:57 +0100
Subject: [PATCH 1/6] #81 [pl][templates][sources] Per Wy / Pluralis
 maiestaticus

---
 locale/pl/sources/sources.tsv     | 1 +
 locale/pl/templates/examples.tsv  | 2 +-
 locale/pl/templates/templates.tsv | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/locale/pl/sources/sources.tsv b/locale/pl/sources/sources.tsv
index 2b210be6e..5b03611cb 100644
--- a/locale/pl/sources/sources.tsv
+++ b/locale/pl/sources/sources.tsv
@@ -91,3 +91,4 @@ bex	Article	Marta Wawrzyn	6 rzeczy, które warto wiedzieć dziś rano	w: „seri
 opowiadaniaOrg	Article	Michał Radomił Wiśniewski	Ludzie z komputera, ludzie z internetu	w: „Gazeta festiwalowa” edycji 16/2020 Międzynarodowego Festiwalu Opowiadania	2020	"Najciekawsze z nich wydają mi się tzw. dukaizmy. Wymyślona przez Jacka Dukaja na potrzeby powieści s.f. <em>Perfekcyjna niedoskonałość</em> forma używana przez postludzkie, postcielesne cyfrowe byty zwane phoebe („phoebe Michał powiedziału, że bardzo by chciału”) została zaadaptowana przez osoby, które miały problemy, aby wyrazić swoją tożsamość w ojczystym języku. Czy to nie piękne? Oto w głowie konserwatywnego pisarza, który lepiej fantazjuje o tym, co będzie za kilkaset lat, niż potrafi zrozumieć świat za oknem (ogłoszone w latach dziewięćdziesiątych arcybinarne opowiadanie pod znamiennym tytułem <em>Wielkie podzielenie</em>, w którym pod wpływem wirusa kobiety mordują mężczyzn), zrodziło się przypadkiem wyjście z językowej pułapki zastawionej przez polszczyznę. Język wyznacza granice naszego świata; jest więc kluczem do ich przesunięcia."		https://opowiadania.org/wp-content/uploads/2020/09/opo16_gazeta_rd.pdf
 vulva	Article	Krystyna Spark	„W szkole nigdy nie uczono nas o różnorodności” – wywiad z Hilde Atalanta – założycielom* The Vulva Gallery	w: „Szajn”	2020	<em>[Krystyna Spark]</em> Wydaje mi się, że jedną z przyczyn sukcesu The Vulva Gallery jest to, jak urocze są twoje ilustracje. Opowiesz mi trochę o swojej „artystycznej stronie”? Gdzie nauczyłoś się tak pięknie malować, uwzględniając tak liczne szczegóły?|<em>[Hilde Atalanta]</em> „Samo się nauczyłom. Nigdy nie miałom profesjonalnej edukacji plastycznej, ale rysowanie i malowanie od zawsze sprawiało mi wiele radości. Uczyłom się grać na fortepianie w konserwatorium w Rotterdamie. Po ukończeniu tego etapu, studiowałom psychologię kliniczną na Uniwersytecie Amsterdamskim – jak widać, to dwie kompletnie różne drogi. Gdy zaczęłom ilustrować w 2016 roku, zauważyłom, że tak naprawdę to sprawiało mi najwięcej szczerej radości.		https://szajnmag.pl/w-szkole-nigdy-nie-uczono-nas-o-roznorodnosci-wywiad-z-hilde-atalanta-zalozycielom-the-vulva-gallery/
 lightBring	Book	Joanna Berry	Światło, które niesiesz	Opowiadanie z gry Star Wars: Squadrons	2020	Keo wyćwiczonym ruchem przykmnęłu przepustnicę A-winga. Pochodziłu z Mirial, miału żółto-zieloną skórę, najwyżej dwadzieścia kilka lat i nie wyglądału na doświadczonego pilota. Szereg wyścigowych rywali, a później imperialnych pilotów, pomylił się w tej kwestii i słono za to zapłacił.@– Grand Prix Socorro Sunset – powiedział Relkin. – Ta sztuczka, którą wywinęłuś w ostatniej chwili – ten mały, oszukańczy manewr, który wytrącił mój statek z kursu – kosztował mnie mistrzowski medal, na który zasługiwałem.		https://www.ea.com/pl-pl/games/starwars/squadrons/news/the-light-you-bring-short-story
+madagarskar	Series	Bartosz Wierzbięta	Pingwiny z Madagaskaru		2009	Rico, stara mordo, jeszcze będziecie rzygać jak pijany messerschmitt.@Szeregowy, za chwilę zobaczycie coś, co za chwilę zobaczycie.		https://pl.wikiquote.org/wiki/Pingwiny_z_Madagaskaru#Skipper
diff --git a/locale/pl/templates/examples.tsv b/locale/pl/templates/examples.tsv
index 042bc6a3d..7bc2d2c0b 100644
--- a/locale/pl/templates/examples.tsv
+++ b/locale/pl/templates/examples.tsv
@@ -3,7 +3,7 @@ Myślę, że {pronoun_n} jest bardzo mił{adjective_n}.	Myślę, że {pronoun_n}
 Tęsknię za {pronoun_g} śmiechem.		FALSE
 Napiszę do {pronoun_g_acc} później.		FALSE
 Powiedział{verb_middle_inter}m {pronoun_d}, że {pronoun_a} lubię.	Powiedzi{verb_middle_inter}śmy {pronoun_d}, że {pronoun_a} lubimy.	FALSE
-Chciał{verb_end_inter}bym pójść do kina.	Chci{verb_middle_inter}byśmy pójść do kina.	FALSE
+Chciał{verb_end_inter}byś pójść do kina?	Chci{verb_middle_inter}byście pójść do kina?	FALSE
 Czy będziesz grał{verb_end_about} z nami?	Czy będziecie gra{verb_end_about} z nami?	FALSE
 Kiedy będziesz m{verb_o}gł{verb_end_about} się z nami spotkać?	Kiedy będziecie m{verb_o}g{verb_end_about} się z nami spotkać?	FALSE
 Gdy był{verb_middle_inter}m w domu, zacz{verb_nasal}ł{verb_middle_inter}m gotować.	Gdy by{verb_end_inter}śmy w domu, zacz{verb_nasal}śmy gotować.	FALSE
diff --git a/locale/pl/templates/templates.tsv b/locale/pl/templates/templates.tsv
index 853419529..b64b82c01 100644
--- a/locale/pl/templates/templates.tsv
+++ b/locale/pl/templates/templates.tsv
@@ -8,7 +8,7 @@ ono/jeno	Rodzaj nijaki z elementami dukaizmów	FALSE	ono	jeno	nieno	nu	no	niemu
 ono/jenu	Rodzaj nijaki z dukaizmami zamiast form męskich	FALSE	ono	jenu	nienu	wu	nu	num	num		e			o	o	o	o	ę	szł	o	pań	FALSE	FALSE	"Rzeczowniki zgodne rodzajowo z rodzajem nijakim to {/rzeczowniki#neutratywy=neutratywy}."	rjpBylom
 onu,onu/jenu	Rodzaj postpłciowy, dukaizmy	FALSE	onu	jenu	nienu	wu	nu	num	num		u			u	u	u	u	ę	szł	o	panu	FALSE	FALSE	"Formy te zostały stworzone przez {https://pl.wikipedia.org/wiki/Jacek_Dukaj=Jacka Dukaja} do książki {https://pl.wikipedia.org/wiki/Perfekcyjna_niedoskonałość=„Perfekcyjna niedoskonałość”}. Używają jej tam istoty post-ludzkie (phoebe), które nie mają określonej płci. Od nazwiska autora te formy gramatyczne są nazywane „dukaizmami”.@Rzeczowniki zgodne z rodzajem postpłciowym to {/rzeczowniki#dukatywy=dukatywy}."	queerZaimki,bogiperson,oTryptyku,loe,opowiadaniaOrg,samounicestwienie,lightBring,liniaOporu,liniaOporuMix,perfekcyjna,zapachKosmosu,smoczeDzieko,interwencja,apocalypseEnby,opydo,trzyWiersze
 onu/jejo	Dukaizmy z łączonymi formami męskimi i żeńskimi	FALSE	onu	jejo	jejo	jeju	jegą	nimą	nimej		u			u	u	u	u	ę	szł	o	panu	FALSE	FALSE	"Formy te wymyśliłu Len Król.@Rzeczowniki zgodne z rodzajem postpłciowym to {/rzeczowniki#dukatywy=dukatywy}."
-oni,oni/ich	Formy męskoosobowe liczby mnogiej	TRUE	oni	ich	nich	im	ich	nimi	nich	cy	i	l	e	li	li	eli	eli	ęli	szli	o	państwo	TRUE	TRUE		degrassi,boika,komiksKlamstwo,starTrekAntyradio,ciekawszaWersja,skrzydla,obcaByla,nawrockaBiogram,odzyskiwanieA,cyborgizacja
+oni,oni/ich	Formy męskoosobowe liczby mnogiej	TRUE	oni	ich	nich	im	ich	nimi	nich	cy	i	l	e	li	li	eli	eli	ęli	szli	o	państwo	TRUE	TRUE	Druga osoba liczby mnogiej może być w normatywnej polszczyźnie używana jako wyraz szacunku (zob. {https://pl.wikipedia.org/wiki/Per_wy=„Per wy”}, {http://www.dialektologia.uw.edu.pl/index.php?l1=leksykon&lid=653=„Pluralis maiestaticus”})	degrassi,madagarskar,boika,komiksKlamstwo,starTrekAntyradio,ciekawszaWersja,skrzydla,obcaByla,nawrockaBiogram,odzyskiwanieA,cyborgizacja
 one,one/ich	Formy niemęskoosobowe liczby mnogiej	TRUE	one	ich	nich	im	je	nimi	nich	tkie	e	ł	o	ły	ły	ały	ały	ęły	szły	o	państwo	TRUE	TRUE		oneDay,protestPoezja
 ona/ich	Nijakie formy mnogie z zaimkiem „ona”	FALSE	ona	ich	nich	im	je	nimi	nich	tkie	e	ł	o	ło	ły	ało	ały	ęło	szło	o	państwo	TRUE	TRUE	Zaimek „ona” zapożyczony z języka chorwackiego, gdzie jest nienacechowaną płciowo formą liczby mnogiej. Dość zresztą intuicyjny w polszczyźnie: jak <em>to okno → te okna</em>, tak to <em>ono → te ona</em>).
 ony,ony/ich	Formy mnogie dukaizmów z zaimkiem „ony”	FALSE	ony	ich	nich	im	ny	nimi	nich	tki	e	ł	o	łu	ły	ału	ały	ęłu	szłu	o	państwo	TRUE	TRUE	"Zaimek „ony” to po czesku liczba mnoga dla rodzaju żeńskiego i męskonieżywotnego. Formy czasowników z „u” zostały stworzone przez {https://pl.wikipedia.org/wiki/Jacek_Dukaj=Jacka Dukaja} do książki {https://pl.wikipedia.org/wiki/Perfekcyjna_niedoskonałość=„Perfekcyjna niedoskonałość”}. Używają jej tam istoty post-ludzkie (phoebe), które nie mają określonej płci. Od nazwiska autora te formy gramatyczne są nazywane „dukaizmami”. Rzeczowniki zgodne z rodzajem postpłciowym to {/rzeczowniki#dukatywy=dukatywy}."	liniaOporuPlural

From 472dc9a49257450cbc8653d33494088ef06b722f Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 29 Oct 2020 17:11:35 +0000
Subject: [PATCH 2/6] delete duplicate flags

---
 static/flags/agender.png     | Bin 2487 -> 0 bytes
 static/flags/nonbinary.png   | Bin 1933 -> 0 bytes
 static/flags/pansexual.png   | Bin 1852 -> 0 bytes
 static/flags/polyamorous.png | Bin 11337 -> 0 bytes
 static/flags/transgender.png | Bin 2033 -> 0 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 static/flags/agender.png
 delete mode 100644 static/flags/nonbinary.png
 delete mode 100644 static/flags/pansexual.png
 delete mode 100644 static/flags/polyamorous.png
 delete mode 100644 static/flags/transgender.png

diff --git a/static/flags/agender.png b/static/flags/agender.png
deleted file mode 100644
index 0a3f828c9d37898dbc7f84c5e76cc19c923df0ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2487
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

diff --git a/static/flags/nonbinary.png b/static/flags/nonbinary.png
deleted file mode 100644
index 6e8a50b33bfa7efa70dbac56d47685e790313a2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1933
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
T1<Z@s00000NkvXXu0mjfmOPjc

diff --git a/static/flags/pansexual.png b/static/flags/pansexual.png
deleted file mode 100644
index ea7843a80c2e2707cc660e2c0a25e844fd93cc50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1852
zcmV-C2gCS@P)<h;3K|Lk000e1NJLTq007kh004jj0{{R3;cdiJ000E+dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cvg;-g{GU~13C!>qSPsvs>>$fegJd7e*15UX
zaaBGNVGE4V^w2#FnEGFT4*CO^B;&|=jUk0#aJl4?WHh4LuC(rK+`6x;`TZFm`|0+M
z5p-G9cKfM$AD_|hzh1bF=W^_)xIdA&8{)g+b=iqL+wIXw^vl-IZa0+r)(9!;qpM{%
zRQG|)mHq4PZf({4O@|HzOCUjjC*86&>+UuW?DoyGf87Jdu}x@O%Y@3=+gw4&VS2aP
zm`8#RB;Q)}%zjGe<V)U1*e5Q-&Jh}?57<BT+dIBI0^7Ssa(p0S^2>Dg?-(tP(YM)U
z7r<!PBWjV&H!~PmK)GG71r){CqphnXln9s#$(yOBpj1vQV1E!hZk%~=Uv=dQ7oBub
z)FM^v>Wfw-NwrfaHwzC@DAsI*mQ^}II%nnX3oqQX@G3_jH^xw57-PKhZJ}R1e5cSD
zbyCEWOi0h0z%t_+ZcOFo9it!!k6kyv2)>nFe)AAm2vsQP7tIk9%%*H6is!G`vP)-+
zaUS)ygqXDL20#(8J)B_+1x#S;Ij~U?Wd@HC0%dqE)=7Z^?7cKNDb8ZGkV=$^jdzsS
zSn(2Mb|W{<<zs_YXoEEcv7GaWA9WEil)d%Ndmp^|NIv--Y;eJc5H!prm({9MuR&F#
zCe6`C7kvy-V~i>0B*`KN`V^9;m{Q7FC<7?NR>t^@o+8B-S9}RYODw76itwqf`WmX%
zSX0eSnr%oEEi`ShrItHWN2chm`yRUX*i+8~u{P{*!;dg@#F0k6tG289Qr=LFchzJm
zHOJ{)HT06|%>>VM;-_X%OdLaToeChJWol+3J10}QshLTFMd1Zb`l$^yo{B+2*IE4F
zyLMm7{g!Uz<8SFE|D+sE={}(xLAqDnPE>0%-PNVowhAYw#$xr=ktJr5QsQU<8E5{S
z``fjeern*qY^b*ZMLL^Wc(&4rP^C5<&}EE>1XXoFXJ|gGA2dwv39pWtEY#y#mjOip
zRD2-5f%@1~Mp~x*5Sz+u9c>Ye%}ku_I7cst)#(CEM74GxsumPBL3xCr?=jwkpzkr>
zgP<$ZID?=o(>Q~mE7LfGpexfjgP`kzA0g<v;716$F8C3Gt_yyIpr0;{8wCAyY1|;_
zr%U4oK|fs@HwgMn62YSVOcFt2`%Dr^gFcf)w9{vjhz`1An7MmMsllczdlG$QQ~UP~
z`8GnDl;Dg%DXj+Q>}<7V9nCl#q85e1p+o^+BRK4-5n=^wm~M0&nYz=;I&#yP@FPy9
zwUkZ`QsG}gfEGA!78gcw(_A)j`@86*;rQzO(vr=*OC22^wO+6l&;7Ynx0Z-F9c)W`
zb@&(lu5kErmv(=7^x{{@i5)Su-cLN^(jO)OGnj&}I7h<~st!kmVn+h5=H=gV-{T(u
zo+QSBy$?O{D{d3m-KTlN#0<K@ffi^2*E|9j$OTcI%n7eAUQJ>N{_o!7F!RXl<n@eI
z^d2aE^5}`v2S#7yKc|zP{5kUZ$mTPdlgbAo>6OVZ9*=?WYZ~cW9^VX4dS>!!c+xRG
zuZJfc<MVoW(lI`-hbJB5^LltvJM-v5c+wM}m&22e@#(f?I!d<P$9FO?eJJ<;Z)mUa
zr#;c%oly4w*9V!r0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKp2MKrb?w$I@m#^
zLx$>Pp{R(XR-p(LLaorMgUO|T(4-|vad8w}3l9D)RvlcNb#-tR1i>E=Cr2km7b)?(
zq|hS9JC1vJ?|WbFz5|3-m1$;Q0?>5J$fS~DF25=UUJ*o?W&%-}ne{nIO2cz}-NVQC
zyExDCuKRNgss)n)K9P8q)eVbygLrz=s&n2aj<B+<5}y-~8+1Y9N3JU_zi}=(Ebz>T
zk<H8#M~KBz4=X*)%7#WfMI2K#o$`g8%PQwB&RVs>I``x+3>Ea1Wv<hTB85dPL4pVc
z4OCEtg*fdxDJC*>p7ijKIDUy-3b`s^<XAur8f3>0{s+H%YZfOb+@w$v=zp>8k5M47
z3$&ZI{e5iP?GwQN3|#45f2{?~e3IVmYOy0AybWAjcQs`XxZDATpX#z9JCdK4P%HxP
zXY@^ZVCWVIuDN~doa6KX$WpJ;H^9LmFjk`Mb&q!s^!DxFnoj?I0E`K8u^ZF^s{jB1
z3{Xr|MgJj;|JVQ_vH$=7{~LfwT>t<832;bRa{vGf6951U69E94oEQKA00(qQO+^Rf
z3J?(=FCfQ8iU0rrI!Q!9R9M69%RvnQAPfYslZFZWpa&H=0}EuoCGEcn0094H#n3cO
q(=<)%-fqRou2`C;X_}^K&D#SW?Ecb~Squ^Y0000<MNUMnLSTaHR%+b<

diff --git a/static/flags/polyamorous.png b/static/flags/polyamorous.png
deleted file mode 100644
index f70fffeab32571374d0a19c756a08a552bee17c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11337
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

diff --git a/static/flags/transgender.png b/static/flags/transgender.png
deleted file mode 100644
index 546cac443d9442105e35ebd525c30ca7d058db8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2033
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
P00000NkvXXu0mjflb^Nq


From 1ab3bfcae5d0c62ce268e42490e2960724f58a56 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 29 Oct 2020 19:57:50 +0100
Subject: [PATCH 3/6] #82 [nouns] pagination

---
 assets/style.scss |  2 +-
 routes/nouns.vue  | 58 +++++++++++++++++++++++++++++++++++------------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/assets/style.scss b/assets/style.scss
index 335784b28..0c0acf388 100644
--- a/assets/style.scss
+++ b/assets/style.scss
@@ -33,7 +33,7 @@ $container-max-widths: (
 //@import "~bootstrap/scss/navbar";
 @import "~bootstrap/scss/card";
 //@import "~bootstrap/scss/breadcrumb";
-//@import "~bootstrap/scss/pagination";
+@import "~bootstrap/scss/pagination";
 @import "~bootstrap/scss/badge";
 //@import "~bootstrap/scss/jumbotron";
 @import "~bootstrap/scss/alert";
diff --git a/routes/nouns.vue b/routes/nouns.vue
index b15aebf66..0f7c04e7b 100644
--- a/routes/nouns.vue
+++ b/routes/nouns.vue
@@ -23,8 +23,8 @@
                     <Loading :value="nounsRaw">
                         <section v-if="$admin()" class="px-3">
                             <div class="alert alert-info">
-                                <strong>{{ nounsCountApproved() }}</strong> <T>nouns.approved</T>,
-                                <strong>{{ nounsCountPending() }}</strong> <T>nouns.pending</T>.
+                                <strong>{{ nounsCountApproved }}</strong> <T>nouns.approved</T>,
+                                <strong>{{ nounsCountPending }}</strong> <T>nouns.pending</T>.
                             </div>
                         </section>
 
@@ -52,7 +52,7 @@
 
                         <section class="table-responsive">
                             <table :class="'table table-striped table-hover table-fixed-' + ($admin() ? 4 : 3)">
-                                <thead>
+                                <thead ref="thead" id="thead">
                                 <tr>
                                     <th class="text-nowrap">
                                         <Icon v="mars"/>
@@ -70,8 +70,8 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <template v-if="visibleNouns().length">
-                                    <tr v-for="noun in visibleNouns()" :class="{'mark-left': !noun.approved}" :key="noun.id">
+                                <template v-if="visibleNouns.length">
+                                    <tr v-for="noun in visibleNounsPage" :class="{'mark-left': !noun.approved}" :key="noun.id">
                                         <td>
                                             <ul class="list-singular">
                                                 <li v-for="w in noun.masc">{{ w }}</li>
@@ -174,6 +174,21 @@
                                     </tr>
                                 </template>
                                 </tbody>
+                                <tfoot v-if="pages > 1">
+                                    <tr>
+                                        <td :colspan="$admin() ? 4 : 3">
+                                            <nav>
+                                                <ul class="pagination pagination-sm justify-content-center">
+                                                    <li v-for="(_, i) in new Array(pages)" :class="['page-item', i === page ? 'active' : '']">
+                                                        <a class="page-link" href="#" @click.prevent="page = i">
+                                                            {{i + 1}}
+                                                        </a>
+                                                    </li>
+                                                </ul>
+                                            </nav>
+                                        </td>
+                                    </tr>
+                                </tfoot>
                             </table>
                         </section>
 
@@ -195,12 +210,15 @@
     import { head } from "../src/helpers";
     import NounsExtra from "../data/nouns/NounsExtra.vue";
 
+    const PER_PAGE = 30;
+
     export default {
         components: { NounsExtra },
         data() {
             return {
                 filter: '',
                 nounsRaw: undefined,
+                page: 0,
             }
         },
         mounted() {
@@ -257,15 +275,6 @@
                 delete this.nouns[noun.id];
                 this.$forceUpdate();
             },
-            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: {
             nouns() {
@@ -288,6 +297,21 @@
                     }
                 }, 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);
+            },
+            nounsCountApproved() {
+                return Object.values(this.nouns).filter(n => n.approved).length;
+            },
+            nounsCountPending() {
+                return Object.values(this.nouns).filter(n => !n.approved).length;
+            },
         },
         watch: {
             filter() {
@@ -297,6 +321,12 @@
                     } else {
                         history.pushState('', document.title, window.location.pathname + window.location.search);
                     }
+                    this.page = 0;
+                    setTimeout(_ => {
+                        if (this.$refs.thead) {
+                            this.$refs.thead.scrollIntoView();
+                        }
+                    }, 300);
                 }
             }
         },

From 6336fbd8455615c92225056b70811bfb62ddb080 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 29 Oct 2020 20:54:13 +0100
Subject: [PATCH 4/6] #82 [nouns] pagination - don't show all pages

---
 routes/nouns.vue | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/routes/nouns.vue b/routes/nouns.vue
index 0f7c04e7b..eafb363c9 100644
--- a/routes/nouns.vue
+++ b/routes/nouns.vue
@@ -179,10 +179,13 @@
                                         <td :colspan="$admin() ? 4 : 3">
                                             <nav>
                                                 <ul class="pagination pagination-sm justify-content-center">
-                                                    <li v-for="(_, i) in new Array(pages)" :class="['page-item', i === page ? 'active' : '']">
-                                                        <a class="page-link" href="#" @click.prevent="page = i">
-                                                            {{i + 1}}
+                                                    <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>
@@ -306,6 +309,21 @@
             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;
             },

From e6f18a1491ca91c9432ce2c5731c0d6ee3e89b00 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 29 Oct 2020 23:23:16 +0100
Subject: [PATCH 5/6] #82 [nouns] pagination - extract Table component

---
 components/Table.vue        | 104 ++++++++++++
 locale/pl/translations.suml |   3 +
 routes/nouns.vue            | 312 +++++++++++++++---------------------
 3 files changed, 236 insertions(+), 183 deletions(-)
 create mode 100644 components/Table.vue

diff --git a/components/Table.vue b/components/Table.vue
new file mode 100644
index 000000000..611853e3c
--- /dev/null
+++ b/components/Table.vue
@@ -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>
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 66387a7a8..94b980abc 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -744,3 +744,6 @@ terms:
     header: 'Regulamin'
     lastUpdate: 'Ostatnia aktualizacja'
     consent: 'Zakładając konto, akceptujesz'
+
+table:
+    empty: 'Pusto…'
diff --git a/routes/nouns.vue b/routes/nouns.vue
index eafb363c9..9ee379db8 100644
--- a/routes/nouns.vue
+++ b/routes/nouns.vue
@@ -23,8 +23,8 @@
                     <Loading :value="nounsRaw">
                         <section v-if="$admin()" class="px-3">
                             <div class="alert alert-info">
-                                <strong>{{ nounsCountApproved }}</strong> <T>nouns.approved</T>,
-                                <strong>{{ nounsCountPending }}</strong> <T>nouns.pending</T>.
+                                <strong>{{ nounsCountApproved() }}</strong> <T>nouns.approved</T>,
+                                <strong>{{ nounsCountPending() }}</strong> <T>nouns.pending</T>.
                             </div>
                         </section>
 
@@ -50,150 +50,122 @@
                             </div>
                         </section>
 
-                        <section class="table-responsive">
-                            <table :class="'table table-striped table-hover table-fixed-' + ($admin() ? 4 : 3)">
-                                <thead ref="thead" id="thead">
-                                <tr>
-                                    <th class="text-nowrap">
-                                        <Icon v="mars"/>
-                                        <T>nouns.masculine</T>
-                                    </th>
-                                    <th class="text-nowrap">
-                                        <Icon v="venus"/>
-                                        <T>nouns.feminine</T>
-                                    </th>
-                                    <th class="text-nowrap">
-                                        <Icon v="neuter"/>
-                                        <T>nouns.neuter</T>
-                                    </th>
-                                    <th v-if="$admin()"></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <template v-if="visibleNouns.length">
-                                    <tr v-for="noun in visibleNounsPage" :class="{'mark-left': !noun.approved}" :key="noun.id">
-                                        <td>
-                                            <ul class="list-singular">
-                                                <li v-for="w in noun.masc">{{ w }}</li>
-                                            </ul>
-                                            <ul class="list-plural">
-                                                <li v-for="w in noun.mascPl">{{ w }}</li>
-                                            </ul>
+                        <Table :data="visibleNouns()" :columns="$admin() ? 4 : 3" :marked="(el) => !el.approved" ref="dictionarytable">
+                            <template v-slot:header>
+                                <th class="text-nowrap">
+                                    <Icon v="mars"/>
+                                    <T>nouns.masculine</T>
+                                </th>
+                                <th class="text-nowrap">
+                                    <Icon v="venus"/>
+                                    <T>nouns.feminine</T>
+                                </th>
+                                <th class="text-nowrap">
+                                    <Icon v="neuter"/>
+                                    <T>nouns.neuter</T>
+                                </th>
+                                <th v-if="$admin()"></th>
+                            </template>
 
-                                            <small v-if="noun.base && nouns[noun.base]">
-                                                <p><strong><T>nouns.edited</T>:</strong></p>
-                                                <ul class="list-singular">
-                                                    <li v-for="w in nouns[noun.base].masc">{{ w }}</li>
-                                                </ul>
-                                                <ul class="list-plural">
-                                                    <li v-for="w in nouns[noun.base].mascPl">{{ w }}</li>
-                                                </ul>
-                                            </small>
+                            <template v-slot:row="s">
+                                <td>
+                                    <ul class="list-singular">
+                                        <li v-for="w in s.el.masc">{{ w }}</li>
+                                    </ul>
+                                    <ul class="list-plural">
+                                        <li v-for="w in s.el.mascPl">{{ w }}</li>
+                                    </ul>
 
-                                            <button v-if="!$admin()" class="btn btn-outline-primary btn-sm m-1 hover-show" @click="edit(noun)">
-                                                <Icon v="pen"/>
-                                                <T>nouns.edit</T>
+                                    <small v-if="s.el.base && nouns[s.el.base]">
+                                        <p><strong><T>nouns.edited</T>:</strong></p>
+                                        <ul class="list-singular">
+                                            <li v-for="w in nouns[s.el.base].masc">{{ w }}</li>
+                                        </ul>
+                                        <ul class="list-plural">
+                                            <li v-for="w in nouns[s.el.base].mascPl">{{ w }}</li>
+                                        </ul>
+                                    </small>
+
+                                    <button v-if="!$admin()" class="btn btn-outline-primary btn-sm m-1 hover-show" @click="edit(s.el)">
+                                        <Icon v="pen"/>
+                                        <T>nouns.edit</T>
+                                    </button>
+                                </td>
+                                <td>
+                                    <ul class="list-singular">
+                                        <li v-for="w in s.el.fem">{{ w }}</li>
+                                    </ul>
+                                    <ul class="list-plural">
+                                        <li v-for="w in s.el.femPl">{{ w }}</li>
+                                    </ul>
+
+                                    <small v-if="s.el.base && nouns[s.el.base]">
+                                        <p><strong><T>nouns.edited</T>:</strong></p>
+                                        <ul class="list-singular">
+                                            <li v-for="w in nouns[s.el.base].fem">{{ w }}</li>
+                                        </ul>
+                                        <ul class="list-plural">
+                                            <li v-for="w in nouns[s.el.base].femPl">{{ w }}</li>
+                                        </ul>
+                                    </small>
+                                </td>
+                                <td>
+                                    <ul class="list-singular">
+                                        <li v-for="w in s.el.neutr">
+                                            <Declension :word="w"/>
+                                        </li>
+                                    </ul>
+                                    <ul class="list-plural">
+                                        <li v-for="w in s.el.neutrPl">
+                                            <Declension :word="w" plural :singularOptions="s.el.neutr"/>
+                                        </li>
+                                    </ul>
+
+                                    <small v-if="s.el.base && nouns[s.el.base]">
+                                        <p><strong><T>nouns.edited</T>:</strong></p>
+                                        <ul class="list-singular">
+                                            <li v-for="w in nouns[s.el.base].neutr">{{ w }}</li>
+                                        </ul>
+                                        <ul class="list-plural">
+                                            <li v-for="w in nouns[s.el.base].neutrPl">{{ w }}</li>
+                                        </ul>
+                                    </small>
+                                </td>
+                                <td v-if="$admin()">
+                                    <ul class="list-unstyled">
+                                        <li v-if="!s.el.approved">
+                                            <button class="btn btn-success btn-sm m-1" @click="approve(s.el)">
+                                                <Icon v="check"/>
+                                                <T>crud.approve</T>
                                             </button>
-                                        </td>
-                                        <td>
-                                            <ul class="list-singular">
-                                                <li v-for="w in noun.fem">{{ w }}</li>
-                                            </ul>
-                                            <ul class="list-plural">
-                                                <li v-for="w in noun.femPl">{{ w }}</li>
-                                            </ul>
+                                        </li>
+                                        <li v-else @click="hide(s.el)">
+                                            <button class="btn btn-outline-secondary btn-sm m-1">
+                                                <Icon v="times"/>
+                                                <T>crud.hide</T>
+                                            </button>
+                                        </li>
+                                        <li>
+                                            <button class="btn btn-outline-danger btn-sm m-1" @click="remove(s.el)">
+                                                <Icon v="trash"/>
+                                                <T>crud.remove</T>
+                                            </button>
+                                        </li>
+                                        <li>
+                                            <button class="btn btn-outline-primary btn-sm m-1" @click="edit(s.el)">
+                                                <Icon v="pen"/>
+                                                <T>crud.edit</T>
+                                            </button>
+                                        </li>
+                                    </ul>
+                                </td>
+                            </template>
 
-                                            <small v-if="noun.base && nouns[noun.base]">
-                                                <p><strong><T>nouns.edited</T>:</strong></p>
-                                                <ul class="list-singular">
-                                                    <li v-for="w in nouns[noun.base].fem">{{ w }}</li>
-                                                </ul>
-                                                <ul class="list-plural">
-                                                    <li v-for="w in nouns[noun.base].femPl">{{ w }}</li>
-                                                </ul>
-                                            </small>
-                                        </td>
-                                        <td>
-                                            <ul class="list-singular">
-                                                <li v-for="w in noun.neutr">
-                                                    <Declension :word="w"/>
-                                                </li>
-                                            </ul>
-                                            <ul class="list-plural">
-                                                <li v-for="w in noun.neutrPl">
-                                                    <Declension :word="w" plural :singularOptions="noun.neutr"/>
-                                                </li>
-                                            </ul>
-
-                                            <small v-if="noun.base && nouns[noun.base]">
-                                                <p><strong><T>nouns.edited</T>:</strong></p>
-                                                <ul class="list-singular">
-                                                    <li v-for="w in nouns[noun.base].neutr">{{ w }}</li>
-                                                </ul>
-                                                <ul class="list-plural">
-                                                    <li v-for="w in nouns[noun.base].neutrPl">{{ w }}</li>
-                                                </ul>
-                                            </small>
-                                        </td>
-                                        <td v-if="$admin()">
-                                            <ul class="list-unstyled">
-                                                <li v-if="!noun.approved">
-                                                    <button class="btn btn-success btn-sm m-1" @click="approve(noun)">
-                                                        <Icon v="check"/>
-                                                        <T>crud.approve</T>
-                                                    </button>
-                                                </li>
-                                                <li v-else @click="hide(noun)">
-                                                    <button class="btn btn-outline-secondary btn-sm m-1">
-                                                        <Icon v="times"/>
-                                                        <T>crud.hide</T>
-                                                    </button>
-                                                </li>
-                                                <li>
-                                                    <button class="btn btn-outline-danger btn-sm m-1" @click="remove(noun)">
-                                                        <Icon v="trash"/>
-                                                        <T>crud.remove</T>
-                                                    </button>
-                                                </li>
-                                                <li>
-                                                    <button class="btn btn-outline-primary btn-sm m-1" @click="edit(noun)">
-                                                        <Icon v="pen"/>
-                                                        <T>crud.edit</T>
-                                                    </button>
-                                                </li>
-                                            </ul>
-                                        </td>
-                                    </tr>
-                                </template>
-                                <template v-else>
-                                    <tr>
-                                        <td :colspan="$admin() ? 4 : 3" class="text-center">
-                                            <Icon v="search"/>
-                                            <T>nouns.empty</T>
-                                        </td>
-                                    </tr>
-                                </template>
-                                </tbody>
-                                <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>
+                            <template v-slot:empty>
+                                <Icon v="search"/>
+                                <T>nouns.empty</T>
+                            </template>
+                        </Table>
 
                         <Separator icon="plus"/>
 
@@ -221,7 +193,6 @@
             return {
                 filter: '',
                 nounsRaw: undefined,
-                page: 0,
             }
         },
         mounted() {
@@ -278,6 +249,17 @@
                 delete this.nouns[noun.id];
                 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: {
             nouns() {
@@ -300,36 +282,6 @@
                     }
                 }, 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: {
             filter() {
@@ -339,12 +291,10 @@
                     } else {
                         history.pushState('', document.title, window.location.pathname + window.location.search);
                     }
-                    this.page = 0;
-                    setTimeout(_ => {
-                        if (this.$refs.thead) {
-                            this.$refs.thead.scrollIntoView();
-                        }
-                    }, 300);
+                    if (this.$refs.dictionarytable) {
+                        this.$refs.dictionarytable.reset();
+                        this.$refs.dictionarytable.focus();
+                    }
                 }
             }
         },
@@ -388,10 +338,6 @@
         }
     }
 
-    .mark-left {
-        border-left: 3px solid $primary;
-    }
-
     tr {
         .hover-show {
             opacity: 0;

From b32fd6409b72279719a56f91a161af4eb258a74c Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 29 Oct 2020 23:41:40 +0100
Subject: [PATCH 6/6] #83 admin panel

---
 components/Account.vue      |  2 +-
 components/Avatar.vue       | 14 ++-----
 components/Table.vue        |  3 +-
 locale/pl/translations.suml |  8 ++++
 nuxt.config.js              |  3 ++
 routes/admin.vue            | 77 +++++++++++++++++++++++++++++++++++++
 routes/nouns.vue            |  2 +-
 server/admin.js             | 41 ++++++++++++++++++++
 8 files changed, 136 insertions(+), 14 deletions(-)
 create mode 100644 routes/admin.vue
 create mode 100644 server/admin.js

diff --git a/components/Account.vue b/components/Account.vue
index 76645aa4e..f1a8c9499 100644
--- a/components/Account.vue
+++ b/components/Account.vue
@@ -13,7 +13,7 @@
                         </a>
                     </p>
                     <p v-if="$admin()">
-                        <span class="badge badge-primary"><T>user.account.admin</T></span>
+                        <nuxt-link to="/admin" class="badge badge-primary"><T>user.account.admin</T></nuxt-link>
                     </p>
                 </div>
                 <div class="mx-2 flex-grow-1">
diff --git a/components/Avatar.vue b/components/Avatar.vue
index 52cc17bba..8e8b0da28 100644
--- a/components/Avatar.vue
+++ b/components/Avatar.vue
@@ -1,5 +1,5 @@
 <template>
-    <img :src="gravatar" alt="" class="rounded-circle"/>
+    <img :src="gravatar" alt="" class="rounded-circle" :style="`width: 100%;max-width: ${dsize};max-height: ${dsize};`"/>
 </template>
 
 <script>
@@ -8,7 +8,8 @@
     export default {
         props: {
             user: { required: true },
-            size: { 'default': 128 }
+            size: { 'default': 128 },
+            dsize: { 'default': '6rem' },
         },
         data() {
             return {
@@ -17,12 +18,3 @@
         },
     }
 </script>
-
-<style lang="scss" scoped>
-    $size: 6rem;
-    img {
-        width: 100%;
-        max-width: $size;
-        max-height: $size;
-    }
-</style>
diff --git a/components/Table.vue b/components/Table.vue
index 611853e3c..985770bfd 100644
--- a/components/Table.vue
+++ b/components/Table.vue
@@ -1,6 +1,6 @@
 <template>
     <section class="table-responsive">
-        <table :class="'table table-striped table-hover table-fixed-' + columns">
+        <table :class="['table table-striped table-hover', fixed ? 'table-fixed-' + columns : '']">
             <thead ref="thead">
             <tr>
                 <slot name="header"></slot>
@@ -53,6 +53,7 @@
             perPage: { 'default': 30 },
             rowKey: { 'default': 'id' },
             marked: {},
+            fixed: { type: Boolean },
         },
         data() {
             return {
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 94b980abc..7b21aaff6 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -745,5 +745,13 @@ terms:
     lastUpdate: 'Ostatnia aktualizacja'
     consent: 'Zakładając konto, akceptujesz'
 
+admin:
+    header: 'Panel adminia'
+    user:
+        user: 'Użytkownik'
+        email: 'Email'
+        roles: 'Role'
+        profiles: 'Profile'
+
 table:
     empty: 'Pusto…'
diff --git a/nuxt.config.js b/nuxt.config.js
index 31449dafa..af4954168 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -105,6 +105,7 @@ export default {
         '/api/nouns': '~/server/nouns.js',
         '/api/user': '~/server/user.js',
         '/api/profile': '~/server/profile.js',
+        '/api/admin': '~/server/admin.js',
     },
     axios: {
         baseURL: process.env.BASE_URL + '/api',
@@ -148,6 +149,8 @@ export default {
                 routes.push({path: '/' + config.user.profileEditorRoute, component: resolve(__dirname, 'routes/profileEditor.vue')});
                 routes.push({path: '/' + config.user.termsRoute, component: resolve(__dirname, 'routes/terms.vue')});
             }
+            routes.push({ path: '/admin', component: resolve(__dirname, 'routes/admin.vue') });
+
             routes.push({ path: '/' + config.template.any.route, component: resolve(__dirname, 'routes/any.vue') });
 
             routes.push({ path: '/@*', component: resolve(__dirname, 'routes/profile.vue') });
diff --git a/routes/admin.vue b/routes/admin.vue
new file mode 100644
index 000000000..242c40edb
--- /dev/null
+++ b/routes/admin.vue
@@ -0,0 +1,77 @@
+<template>
+    <NotFound v-if="!$admin()"/>
+    <div v-else class="container">
+        <h2>
+            <Icon v="user-cog"/>
+            <T>admin.header</T>
+        </h2>
+
+        <Table :data="users" :columns="4">
+            <template v-slot:header>
+                <th class="text-nowrap">
+                    <T>admin.user.user</T>
+                </th>
+                <th class="text-nowrap">
+                    <T>admin.user.email</T>
+                </th>
+                <th class="text-nowrap">
+                    <T>admin.user.roles</T>
+                </th>
+                <th class="text-nowrap">
+                    <T>admin.user.profiles</T>
+                </th>
+            </template>
+
+            <template v-slot:row="s">
+                <td>
+                    <Avatar :user="s.el" dsize="2rem"/>
+                    {{s.el.username}}
+                </td>
+                <td>
+                    <a :href="`mailto:${s.el.email}`" target="_blank" rel="noopener">
+                        {{s.el.email}}
+                    </a>
+                </td>
+                <td>
+                    <span :class="['badge', s.el.roles === 'admin' ? 'badge-primary' : 'badge-light']">
+                        {{s.el.roles}}
+                    </span>
+                </td>
+                <td>
+                    <ul class="list-unstyled">
+                        <li v-for="locale in s.el.profiles" v-if="locales[locale]">
+                            <LocaleLink :link="`/@${s.el.username}`" :locale="locale">
+                                {{ locales[locale].name }}
+                            </LocaleLink>
+                        </li>
+                    </ul>
+                </td>
+            </template>
+        </Table>
+    </div>
+</template>
+
+<script>
+    import {head} from "../src/helpers";
+
+    export default {
+        async asyncData({ app, store }) {
+            if (!store.state.user || store.state.user.roles !== 'admin') {
+                return {};
+            }
+
+            const users = await app.$axios.$get(`/admin/users`, { headers: {
+                authorization: 'Bearer ' + store.state.token,
+            } });
+
+            return {
+                users: Object.values(users),
+            };
+        },
+        head() {
+            return head({
+                title: this.$t('admin.header'),
+            });
+        },
+    }
+</script>
diff --git a/routes/nouns.vue b/routes/nouns.vue
index 9ee379db8..9d1cb09ad 100644
--- a/routes/nouns.vue
+++ b/routes/nouns.vue
@@ -50,7 +50,7 @@
                             </div>
                         </section>
 
-                        <Table :data="visibleNouns()" :columns="$admin() ? 4 : 3" :marked="(el) => !el.approved" ref="dictionarytable">
+                        <Table :data="visibleNouns()" :columns="$admin() ? 4 : 3" :marked="(el) => !el.approved" fixed ref="dictionarytable">
                             <template v-slot:header>
                                 <th class="text-nowrap">
                                     <Icon v="mars"/>
diff --git a/server/admin.js b/server/admin.js
new file mode 100644
index 000000000..234cad1c4
--- /dev/null
+++ b/server/admin.js
@@ -0,0 +1,41 @@
+import {renderJson} from "../src/helpers";
+
+const dbConnection = require('./db');
+const SQL = require('sql-template-strings');
+import authenticate from './authenticate';
+
+
+export default async function (req, res, next) {
+    const db = await dbConnection();
+    const user = authenticate(req);
+
+    if (!user || !user.authenticated || user.roles !== 'admin') {
+        return renderJson(res, {error: 'unauthorised'}, 401);
+    }
+
+    if (req.method === 'GET' && req.url === '/users') {
+        const users = await db.all(SQL`
+            SELECT u.id, u.username, u.email, u.roles, p.locale
+            FROM users u
+                LEFT JOIN profiles p ON p.userId = u.id
+            ORDER BY u.id DESC
+        `);
+
+        const groupedUsers = {};
+        for (let user of users) {
+            if (groupedUsers[user.id] === undefined) {
+                groupedUsers[user.id] = {
+                    ...user,
+                    locale: undefined,
+                    profiles: user.locale ? [user.locale] : [],
+                }
+            } else {
+                groupedUsers[user.id].profiles.push(user.locale);
+            }
+        }
+
+        return renderJson(res, groupedUsers);
+    }
+
+    return renderJson(res, { error: 'notfound' }, 404);
+}