From 4e3f43f5cd386232a11f78cba2f22c65f1cf563e Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Thu, 26 Sep 2024 19:12:27 +0000 Subject: [PATCH 001/183] add new report encounter page and router --- frontend/src/AuthenticatedSwitch.jsx | 2 ++ frontend/src/constants/navMenu.js | 18 ++++++++++++++++++ frontend/src/pages/ReportEncounter.jsx | 9 +++++++++ 3 files changed, 29 insertions(+) create mode 100644 frontend/src/pages/ReportEncounter.jsx diff --git a/frontend/src/AuthenticatedSwitch.jsx b/frontend/src/AuthenticatedSwitch.jsx index 2957bf42fa..1fca661d6d 100644 --- a/frontend/src/AuthenticatedSwitch.jsx +++ b/frontend/src/AuthenticatedSwitch.jsx @@ -10,6 +10,7 @@ import useGetMe from "./models/auth/users/useGetMe"; import AlertBanner from "./components/AlertBanner"; import EncounterSearch from "./pages/EncounterSearch"; import Citation from "./pages/Citation"; +import ReportEncounter from "./pages/ReportEncounter"; export default function AuthenticatedSwitch({ showAlert, setShowAlert }) { const { data } = useGetMe(); @@ -50,6 +51,7 @@ export default function AuthenticatedSwitch({ showAlert, setShowAlert }) { } /> } /> } /> + }/> } /> } /> } /> diff --git a/frontend/src/constants/navMenu.js b/frontend/src/constants/navMenu.js index 43a853dca2..86b559f8a6 100644 --- a/frontend/src/constants/navMenu.js +++ b/frontend/src/constants/navMenu.js @@ -11,6 +11,15 @@ const authenticatedMenu = (username) => [ defaultMessage="Report an Encounter" /> ), + href: `${process.env.PUBLIC_URL}/report`, + }, + { + name: ( + + ), href: "/submit.jsp", }, { @@ -283,6 +292,15 @@ const unAuthenticatedMenu = [ defaultMessage="Report an Encounter" /> ), + href: `${process.env.PUBLIC_URL}/report`, + }, + { + name: ( + + ), href: "/submit.jsp", }, ], diff --git a/frontend/src/pages/ReportEncounter.jsx b/frontend/src/pages/ReportEncounter.jsx new file mode 100644 index 0000000000..53eb50cf1d --- /dev/null +++ b/frontend/src/pages/ReportEncounter.jsx @@ -0,0 +1,9 @@ +import React from "react"; + +export default function ReportEncounter() { + return ( +
+

Report Encounter

+
+ ); + } \ No newline at end of file From fc10f9f4f7f7273033978e6a52dabf1ae39262ef Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Thu, 26 Sep 2024 19:13:06 +0000 Subject: [PATCH 002/183] react header i18n --- frontend/src/locale/de.json | 1 + frontend/src/locale/en.json | 1 + frontend/src/locale/es.json | 1 + frontend/src/locale/fr.json | 1 + frontend/src/locale/it.json | 1 + 5 files changed, 5 insertions(+) diff --git a/frontend/src/locale/de.json b/frontend/src/locale/de.json index 953309fe45..e77401ce72 100644 --- a/frontend/src/locale/de.json +++ b/frontend/src/locale/de.json @@ -19,6 +19,7 @@ "MENU_LEARN_TERMSOFUSE": "Nutzungsbedingungen", "MENU_LEARN_LEARNMORE": "Erfahren Sie mehr über Wildbook", "MENU_LEARN_REPORTENCOUNTER": "Eine Begegnung melden", + "MENU_LEARN_REPORTENCOUNTER_CLASSIC": "Eine Begegnung melden (klassisch)", "MENU_LEARN_BULKIMPORT": "Massenimport", "MENU_LEARN_MYENCOUNTERS": "Meine Begegnungen", "MENU_LEARN_APPROVEDANIMALS": "Meine genehmigten Begegnungen", diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json index b07f12f725..801a4c88e1 100644 --- a/frontend/src/locale/en.json +++ b/frontend/src/locale/en.json @@ -19,6 +19,7 @@ "MENU_LEARN_TERMSOFUSE": "Terms of Use", "MENU_LEARN_LEARNMORE": "Learn more about Wildbook", "MENU_LEARN_REPORTENCOUNTER": "Report an Encounter", + "MENU_LEARN_REPORTENCOUNTER_CLASSIC": "Report an Encounter (Classic)", "MENU_LEARN_BULKIMPORT": "Bulk Import", "MENU_LEARN_MYENCOUNTERS": "My Encounters", "MENU_LEARN_APPROVEDANIMALS": "My Approved Animals", diff --git a/frontend/src/locale/es.json b/frontend/src/locale/es.json index 4c29f7414b..74aa35e786 100644 --- a/frontend/src/locale/es.json +++ b/frontend/src/locale/es.json @@ -19,6 +19,7 @@ "MENU_LEARN_TERMSOFUSE": "Términos de uso", "MENU_LEARN_LEARNMORE": "Aprender más sobre Wildbook", "MENU_LEARN_REPORTENCOUNTER": "Reportar un avistamiento", + "MENU_LEARN_REPORTENCOUNTER_CLASSIC" : "Reportar un avistamiento (clásico)", "MENU_LEARN_BULKIMPORT": "Importación masiva", "MENU_LEARN_MYENCOUNTERS": "Mis encuentros", "MENU_LEARN_APPROVEDANIMALS": "Mis animales aprobados", diff --git a/frontend/src/locale/fr.json b/frontend/src/locale/fr.json index ccd1ed5bd1..ba4c94c5ec 100644 --- a/frontend/src/locale/fr.json +++ b/frontend/src/locale/fr.json @@ -19,6 +19,7 @@ "MENU_LEARN_TERMSOFUSE": "Conditions d'utilisation", "MENU_LEARN_LEARNMORE": "En savoir plus sur Wildbook", "MENU_LEARN_REPORTENCOUNTER": "Signaler une observation", + "MENU_LEARN_REPORTENCOUNTER_CLASSIC" : "Signaler une observation (classique)", "MENU_LEARN_BULKIMPORT": "Importation en masse", "MENU_LEARN_MYENCOUNTERS": "Mes rencontres", "MENU_LEARN_APPROVEDANIMALS": "Mes animaux approuvés", diff --git a/frontend/src/locale/it.json b/frontend/src/locale/it.json index e6330cc4a0..bc555f1195 100644 --- a/frontend/src/locale/it.json +++ b/frontend/src/locale/it.json @@ -19,6 +19,7 @@ "MENU_LEARN_TERMSOFUSE": "Termini di utilizzo", "MENU_LEARN_LEARNMORE": "Scopri di più su Wildbook", "MENU_LEARN_REPORTENCOUNTER": "Segnala un Incontro", + "MENU_LEARN_REPORTENCOUNTER_CLASSIC" : "Segnala un Incontro (Classico)", "MENU_LEARN_BULKIMPORT": "Importazione in massa", "MENU_LEARN_MYENCOUNTERS": "I miei incontri", "MENU_LEARN_APPROVEDANIMALS": "I miei animali approvati", From 8bca181f08f71cbb54f5eb81af60e6a1e9d38f94 Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Thu, 26 Sep 2024 19:13:27 +0000 Subject: [PATCH 003/183] jsp header i18n --- src/main/resources/bundles/de/header.properties | 1 + src/main/resources/bundles/en/header.properties | 1 + src/main/resources/bundles/es/header.properties | 1 + src/main/resources/bundles/fr/header.properties | 1 + src/main/resources/bundles/it/header.properties | 1 + src/main/webapp/header.jsp | 3 ++- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/resources/bundles/de/header.properties b/src/main/resources/bundles/de/header.properties index c358aa6a3e..c4926bac94 100755 --- a/src/main/resources/bundles/de/header.properties +++ b/src/main/resources/bundles/de/header.properties @@ -7,6 +7,7 @@ learn = Lernen intro = Einf\u00FChrung participate = Teilnehmen report = Eine Begegnung melden +reportClassic = Eine Begegnung melden (Klassisch) individuals = Einzelpersonen viewAll = Alle anzeigen encounters = Begegnungen diff --git a/src/main/resources/bundles/en/header.properties b/src/main/resources/bundles/en/header.properties index d91055d021..db6ff5f6a8 100755 --- a/src/main/resources/bundles/en/header.properties +++ b/src/main/resources/bundles/en/header.properties @@ -7,6 +7,7 @@ learn = Learn intro = Introduction participate = Participate report = Report an encounter +reportClassic = Report an encounter(Classic) individuals = Individuals viewAll = View All encounters = Encounters diff --git a/src/main/resources/bundles/es/header.properties b/src/main/resources/bundles/es/header.properties index 4d073a4056..2434443002 100755 --- a/src/main/resources/bundles/es/header.properties +++ b/src/main/resources/bundles/es/header.properties @@ -7,6 +7,7 @@ learn = Aprender intro = Introducci\u00f3n participate = Participar report = Informar un encuentro +reportClassic = Informar un encuentro (Cl\u00e1sico) individuals = Individuos viewAll = Ver todos encounters = Encuentros diff --git a/src/main/resources/bundles/fr/header.properties b/src/main/resources/bundles/fr/header.properties index 56990dfdd1..a6c54ed594 100644 --- a/src/main/resources/bundles/fr/header.properties +++ b/src/main/resources/bundles/fr/header.properties @@ -7,6 +7,7 @@ learn = Apprendre intro = Introduction participate = Participer report = Signaler une rencontre +reportClassic = Signaler une rencontre (Classique) individuals = Individus viewAll = Tout voir encounters = Rencontres diff --git a/src/main/resources/bundles/it/header.properties b/src/main/resources/bundles/it/header.properties index ea68d08359..aaa2b4f714 100644 --- a/src/main/resources/bundles/it/header.properties +++ b/src/main/resources/bundles/it/header.properties @@ -7,6 +7,7 @@ learn = scopri intro = introduzione participate = Partecipa report = Segnala un incontro +reportClassic = Segnala un incontro (Classico) individuals = Gli esemplari viewAll = Guarda tutto encounters = Incontri diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp index 0f1dac52a1..b1813aaf4b 100755 --- a/src/main/webapp/header.jsp +++ b/src/main/webapp/header.jsp @@ -436,7 +436,8 @@ if(request.getUserPrincipal()!=null){