Skip to content

Commit

Permalink
Redesign cleanup (#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
tschumpr authored Sep 2, 2024
2 parents a3453a8 + c734583 commit cf21c07
Show file tree
Hide file tree
Showing 32 changed files with 214 additions and 1,519 deletions.
510 changes: 183 additions & 327 deletions src/Geopilot.Frontend/package-lock.json

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions src/Geopilot.Frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,20 @@
"@mui/icons-material": "^5.16.0",
"@mui/material": "^5.16.0",
"@mui/x-data-grid": "^7.9.0",
"bootstrap": "^5.3.3",
"date-fns": "^2.30.0",
"dayjs": "^1.11.11",
"i18next": "^23.11.5",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.5.2",
"oidc-client-ts": "^3.0.1",
"react": "^18.3.1",
"react-bootstrap": "^2.10.4",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.3",
"react-hook-form": "^7.52.2",
"react-i18next": "^14.1.2",
"react-icons": "^5.2.1",
"react-markdown": "^9.0.1",
"react-oidc-context": "^3.1.0",
"react-router-dom": "^6.24.1",
"rehype-external-links": "^3.0.0",
"styled-components": "^6.1.11"
"rehype-external-links": "^3.0.0"
},
"devDependencies": {
"@types/react": "^18.3.3",
Expand Down
17 changes: 1 addition & 16 deletions src/Geopilot.Frontend/public/locale/de/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@
"bugTracking": "Bugtracking",
"cancel": "Abbrechen",
"clickToUpload": "Zum Hochladen klicken",
"close": "Schliessen",
"codeLicenseInfo": "Der Code steht unter der <licenseLink>MIT Lizenz</licenseLink> im <repositoryLink>Github Repository</repositoryLink> zur Verfügung. Falls Ihnen Bugs begegnen, können Sie dort einen <issuesLink>Issue</issuesLink> eröffnen.",
"comment": "Kommentar",
"completedWithErrors": "Mit Fehlern abgeschlossen",
"contentNotFound": "Ups, nichts gefunden!",
"createDelivery": "Lieferung erstellen",
"createDeliveryFailed": "Bei der Lieferung ist ein unbekannter Fehler aufgetreten, bitte versuchen Sie es mit einer neuen Validierung.",
"createDeliverySuccess": "Lieferung erfolgreich",
"delete": "Löschen",
"deleteDeliveryConfirmationMessage": "Diese Aktion kann nicht rückgängig gemacht werden.",
"deleteDeliveryConfirmationTitle": "Möchten Sie die Daten der Lieferung wirklich löschen?",
Expand All @@ -35,23 +32,18 @@
"development": "Entwicklung",
"disconnect": "Verbindungen trennen",
"done": "Fertig",
"downloadLogTooltip": "-Datei herunterladen",
"dragAndDrop": "Drag & Drop",
"edit": "Bearbeiten",
"email": "E-Mail",
"errors": "Fehler",
"failed": "Fehlgeschlagen",
"file": "Datei",
"fileDropzoneErrorChooseFile": "Bitte wählen Sie eine gültige Datei aus",
"fileDropzoneErrorFileTooLarge": "Die ausgewählte Datei ist über 200MB gross",
"fileDropzoneErrorNotSupported": "Der Dateityp wird nicht unterstützt",
"fileDropzoneErrorTooManyFiles": "Es kann nur eine Datei aufs Mal geprüft werden",
"fileTypes": "Formate",
"fileTypesLoadingError": "Beim Laden der Formate ist ein Fehler aufgetreten: {{error}}",
"help": "Hilfe",
"id": "ID",
"imprint": "Impressum",
"info": "Info",
"invalidContentType": "Ungültiger Antworttyp",
"isAdmin": "Ist Admin",
"isPartialDelivery": "Ist Teillieferung",
Expand All @@ -61,7 +53,6 @@
"logIn": "Anmelden",
"logInForDelivery": "Anmelden um Lieferung zu erstellen",
"logOut": "Abmelden",
"loggedInAs": "Angemeldet als {{name}}",
"longitude": "Länge",
"mandate": "Mandat",
"mandateDisconnectMessage": "Das Mandat wird von allen Organisationen getrennt. Diese Aktion kann nicht rückgängig gemacht werden.",
Expand All @@ -70,7 +61,6 @@
"mandates": "Mandate",
"mandatesLoadingError": "Beim Laden der Mandate ist ein Fehler aufgetreten: {{error}}",
"name": "Name",
"noErrors": "Keine Fehler",
"or": "oder",
"organisationDisconnectMessage": "Die Organisation wird von allen Mandaten und Benutzer:innen getrennt. Diese Aktion kann nicht rückgängig gemacht werden.",
"organisationDisconnectTitle": "Möchten Sie die Organisation wirklich inaktiv setzen?",
Expand All @@ -79,19 +69,14 @@
"organisationsLoadingError": "Beim Laden der Organisationen ist ein Fehler aufgetreten: {{error}}",
"predecessor": "Vorgänger",
"privacyPolicy": "Datenschutz",
"reset": "Aktuelle Änderungen zurücksetzen",
"resetDelivery": "Lieferung zurücksetzen",
"resetCurrentChanges": "Aktuelle Änderungen zurücksetzen",
"save": "Speichern",
"spatialExtent": "Räumliche Ausdehnung",
"spatialExtentIncompleteMessage": "Es müssen entweder alle Felder leer oder alle abgefüllt sein. Möchten Sie die aktuellen Änderungen zurücksetzen?",
"spatialExtentIncompleteTitle": "Ungültige räumliche Ausdehnung",
"stacBrowser": "STAC Browser",
"termsOfUse": "Nutzungsbestimmungen",
"termsOfUseAcceptance": "Ich akzeptiere die <termsLink>Nutzungsbestimmungen</termsLink>.",
"type": "Typ",
"upload": "Hochladen",
"uploadFile": "{{fileName}} hochladen...",
"uploadNotSuccessful": "Der Upload war nicht erfolgreich. Die Validierung wurde abgebrochen.",
"userDisconnectMessage": "Der Benutzer wird von allen Organisationen getrennt. Diese Aktion kann nicht rückgängig gemacht werden.",
"userDisconnectTitle": "Möchten Sie den Benutzer wirklich inaktiv setzen?",
"userLoadingError": "Beim Laden der Benutzer:in ist ein Fehler aufgetreten: {{error}}",
Expand Down
21 changes: 3 additions & 18 deletions src/Geopilot.Frontend/public/locale/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@
"bugTracking": "bug tracking",
"cancel": "Cancel",
"clickToUpload": "Click to upload",
"close": "Close",
"codeLicenseInfo": "The code is available under the <licenseLink>MIT license</licenseLink> in the <repositoryLink>Github repository</repositoryLink>. If you encounter bugs, you can open a <issuesLink>issue</issuesLink> there.",
"codeLicenseInfo": "The code is available under the <licenseLink>MIT license</licenseLink> in the <repositoryLink>Github repository</repositoryLink>. If you encounter bugs, you can open an <issuesLink>issue</issuesLink> there.",
"comment": "Comment",
"completedWithErrors": "Completed with errors",
"contentNotFound": "Oops, nothing found!",
"createDelivery": "Create delivery",
"createDeliveryFailed": "An unknown error occurred during delivery, please try a new validation.",
"createDeliverySuccess": "Delivery successful",
"delete": "Delete",
"deleteDeliveryConfirmationMessage": "This action cannot be undone.",
"deleteDeliveryConfirmationTitle": "Do you really want to delete the delivery data?",
Expand All @@ -30,28 +27,23 @@
"deliveryOverviewDeleteError": "An error occurred while deleting the delivery: {{error}}",
"deliveryOverviewDeleteIdError": "An error occurred while deleting the delivery with the ID {{id}}",
"deliveryOverviewDeleteIdNotExistError": "The delivery with the ID {{id}} does not exist and therefore cannot be deleted.",
"deliveryOverviewLoadError": "An error occurred while loading the deliveries: {{error}}",
"deliveryOverviewLoadingError": "An error occurred while loading the deliveries: {{error}}",
"deliveryTitle": "Online validation & delivery of geodata",
"development": "Development",
"disconnect": "Disconnect",
"done": "Done",
"downloadLogTooltip": "Download log file",
"dragAndDrop": "drag and drop",
"edit": "Edit",
"email": "Email",
"errors": "Errors",
"failed": "Failed",
"file": "File",
"fileDropzoneErrorChooseFile": "Please choose a valid file",
"fileDropzoneErrorFileTooLarge": "The selected file is larger than 200MB",
"fileDropzoneErrorNotSupported": "The file type is not supported",
"fileDropzoneErrorTooManyFiles": "Only one file can be checked at a time",
"fileTypes": "Formats",
"fileTypesLoadingError": "An error occurred while loading the formats: {{error}}",
"help": "Help",
"id": "ID",
"imprint": "Imprint",
"info": "Info",
"invalidContentType": "Invalid response type",
"isAdmin": "Is Admin",
"isPartialDelivery": "Is partial delivery",
Expand All @@ -61,7 +53,6 @@
"logIn": "Log In",
"logInForDelivery": "Log in to create delivery",
"logOut": "Log Out",
"loggedInAs": "Logged in as {{name}}",
"longitude": "Longitude",
"mandate": "Mandate",
"mandateDisconnectMessage": "This will remove all connections to organisations and cannot be undone.",
Expand All @@ -70,7 +61,6 @@
"mandates": "Mandates",
"mandatesLoadingError": "An error occurred while loading the mandates: {{error}}",
"name": "Name",
"noErrors": "No Errors",
"or": "or",
"organisationDisconnectMessage": "This will remove all connections to mandates and users, and cannot be undone.",
"organisationDisconnectTitle": "Do you really want to disconnect the organisation?",
Expand All @@ -79,19 +69,14 @@
"organisationsLoadingError": "An error occurred while loading the organisations: {{error}}",
"predecessor": "Predecessor",
"privacyPolicy": "Privacy policy",
"reset": "Reset current changes",
"resetDelivery": "Reset delivery",
"resetCurrentChanges": "Reset current changes",
"save": "Save",
"spatialExtent": "Spatial extent",
"spatialExtentIncompleteMessage": "All fields must either be empty or filled in. Would you like to reset the current changes?",
"spatialExtentIncompleteTitle": "Invalid spatial extent",
"stacBrowser": "STAC Browser",
"termsOfUse": "Terms of use",
"termsOfUseAcceptance": "I accept the <termsLink>terms of use</termsLink>.",
"type": "Type",
"upload": "Upload",
"uploadFile": "Upload {{fileName}}...",
"uploadNotSuccessful": "The upload was not successful. Validation has been aborted.",
"userDisconnectMessage": "This will remove all connections to organisations and cannot be undone.",
"userDisconnectTitle": "Do you really want to disconnect the user?",
"userLoadingError": "An error occurred while loading the user: {{error}}",
Expand Down
17 changes: 1 addition & 16 deletions src/Geopilot.Frontend/public/locale/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@
"bugTracking": "Suivi des bugs",
"cancel": "Annuler",
"clickToUpload": "Cliquer pour télécharger",
"close": "Fermer",
"codeLicenseInfo": "Le code est disponible sous la licence <licenseLink>MIT</licenseLink> dans le référentiel <repositoryLink>GitHub</repositoryLink>. Si vous rencontrez des bugs, vous pouvez ouvrir un <issuesLink>problème</issuesLink> là-bas.",
"comment": "Commentaire",
"completedWithErrors": "Terminé avec des erreurs",
"contentNotFound": "Oups, rien n'a été trouvé!",
"createDelivery": "Créer une livraison",
"createDeliveryFailed": "Une erreur inconnue s'est produite lors de la livraison. Veuillez réessayer avec une nouvelle validation.",
"createDeliverySuccess": "Livraison réussie",
"delete": "Supprimer",
"deleteDeliveryConfirmationMessage": "Cette action est irréversible.",
"deleteDeliveryConfirmationTitle": "Voulez-vous vraiment supprimer les données de la livraison?",
Expand All @@ -35,23 +32,18 @@
"development": "Développement",
"disconnect": "Déconnecter",
"done": "Terminé",
"downloadLogTooltip": "Télécharger le fichier -",
"dragAndDrop": "glisser et poser",
"edit": "Éditer",
"email": "E-mail",
"errors": "Erreurs",
"failed": "Échoué",
"file": "Fichier",
"fileDropzoneErrorChooseFile": "Veuillez sélectionner un fichier valide",
"fileDropzoneErrorFileTooLarge": "Le fichier sélectionné est supérieur à 200 Mo",
"fileDropzoneErrorNotSupported": "Le type de fichier n'est pas pris en charge",
"fileDropzoneErrorTooManyFiles": "Seul un fichier peut être vérifié à la fois",
"fileTypes": "Formats",
"fileTypesLoadingError": "Une erreur s'est produite lors du chargement des formats: {{error}}",
"help": "Aide",
"id": "ID",
"imprint": "Mentions légales",
"info": "Info",
"invalidContentType": "Type de réponse non valide",
"isAdmin": "Est administrateur",
"isPartialDelivery": "La livraison partielle est-elle",
Expand All @@ -61,7 +53,6 @@
"logIn": "Se connecter",
"logInForDelivery": "Connectez-vous pour créer une livraison",
"logOut": "Se déconnecter",
"loggedInAs": "Connecté en tant que {{name}}",
"longitude": "Longitude",
"mandate": "Mandat",
"mandateDisconnectMessage": "Cette opération supprime toutes les connexions avec les organisations. Cette action ne peut pas être annulée.",
Expand All @@ -70,7 +61,6 @@
"mandates": "Mandats",
"mandatesLoadingError": "Une erreur s'est produite lors du chargement des mandats: {{error}}",
"name": "Nom",
"noErrors": "Pas d'erreurs",
"or": "ou",
"organisationDisconnectMessage": "Cette action supprime toutes les connexions avec les mandats et les utilisateurs. Cette action ne peut pas être annulée.",
"organisationDisconnectTitle": "Voulez-vous vraiment déconnecter l'organisation?",
Expand All @@ -79,19 +69,14 @@
"organisationsLoadingError": "Une erreur s'est produite lors du chargement des organisations: {{error}}",
"predecessor": "Prédécesseur",
"privacyPolicy": "Politique de confidentialité",
"reset": "Réinitialiser les modifications en cours",
"resetDelivery": "Réinitialiser la livraison",
"resetCurrentChanges": "Réinitialiser les modifications en cours",
"save": "Sauver",
"spatialExtent": "Étendue spatiale",
"spatialExtentIncompleteMessage": "Tous les champs doivent être soit vides, soit tous remplis. Vous souhaitez réinitialiser les modifications en cours?",
"spatialExtentIncompleteTitle": "Étendue spatiale non valide",
"stacBrowser": "Navigateur STAC",
"termsOfUse": "Conditions d'utilisation",
"termsOfUseAcceptance": "J'accepte les <termsLink>conditions d'utilisation</termsLink>.",
"type": "Type",
"upload": "Télécharger",
"uploadFile": "Télécharger {{fileName}}...",
"uploadNotSuccessful": "Le téléchargement n'a pas réussi. La validation a été annulée.",
"userDisconnectMessage": "Cet utilisateur sera déconnecté de toutes les organisations. Cette action ne peut pas être annulée.",
"userDisconnectTitle": "Voulez-vous vraiment déconnecter l'utilisateur?",
"userLoadingError": "Une erreur s'est produite lors du chargement d'utilisateur: {{error}}",
Expand Down
17 changes: 1 addition & 16 deletions src/Geopilot.Frontend/public/locale/it/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@
"bugTracking": "Tracciamento bug",
"cancel": "Annulla",
"clickToUpload": "Clicca per caricare",
"close": "Chiudi",
"codeLicenseInfo": "Il codice è disponibile sotto la licenza <licenseLink>MIT</licenseLink> nel <repositoryLink>repository di GitHub</repositoryLink>. Se trovi dei bug, puoi aprire un <issuesLink>Issue</issuesLink> lì.",
"comment": "Commento",
"completedWithErrors": "Completato con errori",
"contentNotFound": "Ops, non è stato trovato nulla!",
"createDelivery": "Crea consegna",
"createDeliveryFailed": "Si è verificato un errore sconosciuto durante la consegna, prova a fare una nuova validazione.",
"createDeliverySuccess": "Consegna creata con successo",
"delete": "Elimina",
"deleteDeliveryConfirmationMessage": "Questa azione non può essere annullata.",
"deleteDeliveryConfirmationTitle": "Vuoi davvero eliminare i dati della consegna?",
Expand All @@ -35,23 +32,18 @@
"development": "Sviluppo",
"disconnect": "Disconnessione",
"done": "Fatto",
"downloadLogTooltip": "Scarica file -",
"dragAndDrop": "drag and drop",
"edit": "Modifica",
"email": "E-mail",
"errors": "Errori",
"failed": "Fallito",
"file": "File",
"fileDropzoneErrorChooseFile": "Seleziona un file valido",
"fileDropzoneErrorFileTooLarge": "Il file selezionato è troppo grande (oltre 200MB)",
"fileDropzoneErrorNotSupported": "Tipo di file non supportato",
"fileDropzoneErrorTooManyFiles": "Puoi verificare solo un file alla volta",
"fileTypes": "Formati",
"fileTypesLoadingError": "Si è verificato un errore durante il caricamento dei formati: {{error}}",
"help": "Aiuto",
"id": "ID",
"imprint": "Impressum",
"info": "Informazioni",
"invalidContentType": "Tipo di risposta non valido",
"isAdmin": "È amministratore",
"isPartialDelivery": "È una consegna parziale",
Expand All @@ -61,7 +53,6 @@
"logIn": "Accedi",
"logInForDelivery": "Accedi per creare una consegna",
"logOut": "Esci",
"loggedInAs": "Accesso effettuato come {{name}}",
"longitude": "Longitudine",
"mandate": "Mandato",
"mandateDisconnectMessage": "Questa operazione rimuove tutti i collegamenti alle organizzazioni e non può essere annullata.",
Expand All @@ -70,7 +61,6 @@
"mandates": "Mandati",
"mandatesLoadingError": "Si è verificato un errore durante il caricamento dei mandati: {{error}}",
"name": "Nome",
"noErrors": "Nessun errore",
"or": "o",
"organisationDisconnectMessage": "Questa operazione rimuove tutti i collegamenti ai mandati e agli utenti, e non può essere annullata.",
"organisationDisconnectTitle": "Volete davvero scollegare l'organizzazione?",
Expand All @@ -79,19 +69,14 @@
"organisationsLoadingError": "Si è verificato un errore durante il caricamento delle organizzazioni: {{error}}",
"predecessor": "Predecessore",
"privacyPolicy": "Informativa sulla privacy",
"reset": "Ripristino delle modifiche correnti",
"resetDelivery": "Ripristino la consegna",
"resetCurrentChanges": "Ripristino delle modifiche correnti",
"save": "Salvare",
"spatialExtent": "Misura spaziale",
"spatialExtentIncompleteMessage": "Tutti i campi devono essere vuoti o compilati. Volete ripristinare le modifiche correnti?",
"spatialExtentIncompleteTitle": "Misura spaziale non valida",
"stacBrowser": "Browser STAC",
"termsOfUse": "Termini di utilizzo",
"termsOfUseAcceptance": "Accetto i <termsLink>Termini di utilizzo</termsLink>.",
"type": "Tipo",
"upload": "Caricare",
"uploadFile": "Carica {{fileName}}...",
"uploadNotSuccessful": "Caricamento non riuscito. La validazione è stata interrotta.",
"userDisconnectMessage": "Questa operazione rimuove tutti i collegamenti alle organizzazioni e non può essere annullata.",
"userDisconnectTitle": "Volete davvero scollegare l'utente?",
"userLoadingError": "Si è verificato un errore durante il caricamento del' utento: {{error}}",
Expand Down
6 changes: 3 additions & 3 deletions src/Geopilot.Frontend/src/appContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ export const AppContext = () => {
<GlobalStyles
styles={{
":root": {
"--bs-body-font-family": '"NeoGeo", sans-serif',
"--bs-body-font-size": "16px",
"--bs-body-letter-spacing": "0.05em",
"font-family": '"NeoGeo", sans-serif',
"font-size": "16px",
"letter-spacing": "0.05em",
},
}}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const DataGridSpatialExtentColumn = ({ params }: DataGridSpatialExtentColumnProp
showPrompt(t("spatialExtentIncompleteTitle"), t("spatialExtentIncompleteMessage"), [
{ label: t("cancel") },
{
label: t("reset"),
label: t("resetCurrentChanges"),
action: () => {
setDefaultSpatialExtent();
setPopoverAnchor(null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const DataGridSpatialExtentPopoverContent: FC<SpatialExtentPopoverContent
{renderCoordinateRow(1)}
<FlexRowEndBox>
<Button size="small" onClick={reset}>
{t("reset")}
{t("resetCurrentChanges")}
</Button>
</FlexRowEndBox>
</Box>
Expand Down
4 changes: 2 additions & 2 deletions src/Geopilot.Frontend/src/components/fileDropzone.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const FileDropzone: FC<FileDropzoneProps> = ({
? ""
: (fileExtensions?.length ?? 0) > 1
? `${fileExtensions!.slice(0, -1).join(", ")} ${t("or")} ${fileExtensions!.slice(-1)}`
: fileExtensions?.join(", ") ?? "";
: (fileExtensions?.join(", ") ?? "");
}, [acceptsAllFileTypes, fileExtensions, t]);

const onDrop = useCallback(
Expand Down Expand Up @@ -98,7 +98,7 @@ export const FileDropzone: FC<FileDropzoneProps> = ({
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
minHeight: "100px",
minHeight: "56px",
padding: "20px",
border: `2px dashed`,
borderColor: disabled
Expand Down
Loading

0 comments on commit cf21c07

Please sign in to comment.