diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 44139664..f7b07a1c 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -109,7 +109,7 @@ $navbar-breakpoint: 1024px; @import '~buefy/src/scss/buefy'; :root { - --header-height: 52px; + --header-height: 56px; --primary: #{$primary}; @custom-media --only-small (width < 500px); @custom-media --only-medium (width >= 500px) and (width <= 839px); @@ -120,10 +120,14 @@ $navbar-breakpoint: 1024px; html { overflow-y: auto; + height: 100vh; + width: 100%; } body { margin: 0; + height: 100%; + width: 100%; } .app { @@ -131,6 +135,9 @@ body { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; padding-top: var(--header-height); + height: 100%; + width: 100%; + & > .section { padding-top: var(--header-height); } diff --git a/frontend/src/components/AddReport.vue b/frontend/src/components/AddReport.vue index 08c01228..b2df21cc 100644 --- a/frontend/src/components/AddReport.vue +++ b/frontend/src/components/AddReport.vue @@ -104,7 +104,7 @@ {{ file.name }} -

{{ $t('photo_multiple_tracer') }}

+

{{ $t('photo_multiple_tracer') }}

{{ $t('add_report') }} + + + + + {{ $t('report_verb') }} + @@ -422,7 +428,7 @@ export default { validatefile ]) resolve(validation.every(v => v)) - document.querySelector('.add-report').scrollTop = 0; + document.querySelector('.add-report').scrollTop = 0 } if (step === 2) { @@ -844,7 +850,8 @@ export default { { "en": { - "add_report": "Add a report", + "report_verb": "Report", + "add_report": "Report a waste", "address": "Address", "cancel_report": "Close reporting", "click_select": "Click to select", @@ -870,11 +877,12 @@ export default { "load_tracers_failure": "Fail to load tracers" }, "fr": { - "add_report": "Ajouter un témoignage", + "report_verb": "Signaler", + "add_report": "Signaler un déchêt", "address": "Adresse", - "cancel_report": "Fermer l'ajout de témoignage", + "cancel_report": "Fermer l'ajout de signalement", "click_select": "Cliquez pour sélectionner", - "click_to_report": "Cliquer sur la carte pour localiser le témoignage", + "click_to_report": "Cliquer sur la carte pour localiser le signalement", "close": "Fermer", "description": "Description", "done": "Fin", @@ -885,18 +893,19 @@ export default { "optional": "optionnel", "previous": "Précédent", "quantity": "Quantité", - "report_date": "Date de témoignage", - "report_review": "Merci pour votre témoignage. Un administrateur va bientôt le passer en revu.", - "report": "Témoignage", + "report_date": "Date de signalement", + "report_review": "Merci pour votre signalement. Un administrateur va bientôt le passer en revu.", + "report": "Signalement", "submit": "Soumettre", "tracers": "Traceur | Traceurs", - "submit_report_failure": "Échec d'ajout d'un témoignage", + "submit_report_failure": "Échec d'ajout d'un signalement", "photo": "Photo", "photo_multiple_tracer": "Une photo peut contenir plusieurs tracers", "load_tracers_failure": "Échec de chargement des tracers" }, "es": { - "add_report": "Agrega un testimonio", + "report_verb": "Informe", + "add_report": "Reportar un desperdicio", "address": "Dirección", "cancel_report": "Cerrar agrega testimonio", "click_select": "Clic para seleccionar", diff --git a/frontend/src/components/MenuNav.vue b/frontend/src/components/MenuNav.vue index bf45a26a..b8d8c383 100644 --- a/frontend/src/components/MenuNav.vue +++ b/frontend/src/components/MenuNav.vue @@ -178,9 +178,10 @@ export default { } - @@ -117,6 +131,7 @@ export default { "nothing": "No data", "origin": "Origin", "per_page": "per page", + "reported_quantity": "Reported quantity", "type": "Type" }, "fr": { @@ -125,6 +140,7 @@ export default { "nothing": "Pas de données", "origin": "Origine", "per_page": "par page", + "reported_quantity": "Quantité signalée", "type": "Type" }, "es": { @@ -133,6 +149,7 @@ export default { "nothing": "Sin datos", "origin": "Origen", "per_page": "por página", + "reported_quantity": "Cantidad testificada", "type": "Tipo" } } diff --git a/frontend/src/components/tools/FilterReportsByTracer.vue b/frontend/src/components/tools/FilterReportsByTracer.vue index 2a4a7f5d..9c15afc7 100644 --- a/frontend/src/components/tools/FilterReportsByTracer.vue +++ b/frontend/src/components/tools/FilterReportsByTracer.vue @@ -75,7 +75,10 @@ export default { }, filteredTracersList: function() { return this.tracers.filter(t => { - return t.name.toLowerCase().includes(this.search.toLowerCase()) + return ( + t.name.toLowerCase().includes(this.search.toLowerCase()) && + this.getReportCount()(t.id) > 0 + ) }) } }, @@ -93,13 +96,15 @@ export default { } - @@ -543,21 +583,21 @@ export default { { "en": { "object": "item | items", - "search": "Search", + "search_location": "Find a place", "no_address_found": "No address found", "by": "By", "map_init_failure": "Error initializing map" }, "fr": { "object": "exemplaire | exemplaires", - "search": "Rechercher", + "search_location": "Rechercher un endroit", "no_address_found": "Pas d'adresse trouvée", "by": "Par", "map_init_failure": "Échec d'initialisation de la carte" }, "es": { "object": "objeto | objetos", - "search": "Buscar", + "search_location": "Encontrar un lugar", "no_address_found": "No se encontró dirección", "by": "pro", "map_init_failure": "Error al inicializar el mapa" diff --git a/frontend/src/views/Leaderboard.vue b/frontend/src/views/Leaderboard.vue index 37860dd6..ff5112c5 100644 --- a/frontend/src/views/Leaderboard.vue +++ b/frontend/src/views/Leaderboard.vue @@ -122,7 +122,7 @@ export default { "contributions": "Contributions", "last_activity": "Dernière activité", "name": "Nom", - "number_of_reports": "Nombre de témoignages", + "number_of_reports": "Nombre de signalements", "per_page": "par page", "search": "Rechercher", "loading_failure": "Échec de chargement des contributions" diff --git a/frontend/src/views/MyReports.vue b/frontend/src/views/MyReports.vue index 1de54b7b..2b40772c 100644 --- a/frontend/src/views/MyReports.vue +++ b/frontend/src/views/MyReports.vue @@ -29,6 +29,7 @@ :pagination-simple="false" :default-sort-direction="defaultSortDirection" :default-sort="reported_at" + striped >