From 4cf41441dcae295593020b9d225f8fa1a02ac4c6 Mon Sep 17 00:00:00 2001 From: Ancymonek Date: Wed, 21 Feb 2024 19:08:54 +0100 Subject: [PATCH 1/5] Minor UI adjustments, allow download only countries with > 0 --- package-lock.json | 125 ++++++++++++++++++ package.json | 3 +- src/components/downloadCard.tsx | 14 +- src/components/languageSwitcher.tsx | 41 ++++-- src/components/logInButton.tsx | 12 +- src/components/map.css | 7 +- src/components/modal.tsx | 7 +- src/components/navbar.css | 9 +- src/components/navbar.tsx | 42 ++++-- src/components/partnersModal.tsx | 6 +- src/components/sidebar-left.tsx | 10 +- .../sidebar/defibrillatorDetails.tsx | 6 +- src/index.css | 21 +-- 13 files changed, 243 insertions(+), 60 deletions(-) diff --git a/package-lock.json b/package-lock.json index 891a6d1..67a5e14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,6 +38,7 @@ "@types/react-image-gallery": "^1.2.4", "@vitejs/plugin-react": "^4.2.1", "@vitest/coverage-v8": "^1.2.2", + "lefthook": "^1.6.1", "sass": "^1.70.0", "vite": "^5.1.1", "vite-plugin-sitemap": "^0.5.3", @@ -3320,6 +3321,130 @@ "node": ">=0.10.0" } }, + "node_modules/lefthook": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook/-/lefthook-1.6.1.tgz", + "integrity": "sha512-1T+tk0V6ubZgiZJGi39QlLMAcgEw+lhoDeSpT3L8Y/f8nUpJW9ntcMOmt+uvMfQ3TVjNcR1r/Lhtm7gTqgdcPg==", + "dev": true, + "hasInstallScript": true, + "bin": { + "lefthook": "bin/index.js" + }, + "optionalDependencies": { + "lefthook-darwin-arm64": "1.6.1", + "lefthook-darwin-x64": "1.6.1", + "lefthook-freebsd-arm64": "1.6.1", + "lefthook-freebsd-x64": "1.6.1", + "lefthook-linux-arm64": "1.6.1", + "lefthook-linux-x64": "1.6.1", + "lefthook-windows-arm64": "1.6.1", + "lefthook-windows-x64": "1.6.1" + } + }, + "node_modules/lefthook-darwin-arm64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.6.1.tgz", + "integrity": "sha512-q6+sYr2Dpt6YnBGXRjMFcXZUnVB97nH+s7EP/tX8m9ewvQxLPqIiUPyAumfyJ2Siomkc5WgAinG+kT63VjUN3A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/lefthook-darwin-x64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-darwin-x64/-/lefthook-darwin-x64-1.6.1.tgz", + "integrity": "sha512-utm7FwtbW8SxGMALIw5/iG4loYS2FI0crDKp/YIamrZgQr6M4pS2C3rxGj5OwiHFIm3arVU+3VZywdvRLJAw0w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/lefthook-freebsd-arm64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.6.1.tgz", + "integrity": "sha512-F2BoDnGznkJyn6lyhmXpu62yq7SMCeHAl3Bl8c+P6mXfmatjjxEpVmrzRuzKMPd/MRGpy2B/glkuyO4wZZazow==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/lefthook-freebsd-x64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.6.1.tgz", + "integrity": "sha512-/NBjMUtnwvdc/p821sfPnZCbWZ6FQkAvnvjoaQu6tkajKZbZYSKsl7UtAicO0nT+79BQFt7TbaZjpua2T9tM5w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/lefthook-linux-arm64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-linux-arm64/-/lefthook-linux-arm64-1.6.1.tgz", + "integrity": "sha512-ke+2ni/bmxgYJSRsH+uIYYfTLj2It7WP+mcF4rfJHRbzn5yDYIjFgylUMC2CgW5urS4DSbxcRIbAqLY3OXAHnw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/lefthook-linux-x64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-linux-x64/-/lefthook-linux-x64-1.6.1.tgz", + "integrity": "sha512-/HLkl9jt3XRjT0RPaLpAgUQmvp4zV/KKZ/8x6xslPl89krv3ZkHKKrqeaHdhiengq3hzx3N+KbOfFcxBRzdT6A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/lefthook-windows-arm64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-windows-arm64/-/lefthook-windows-arm64-1.6.1.tgz", + "integrity": "sha512-RyQ8S4/45BpJpRPy7KsOuJeXQ5FOa7MASoPtOYvrXt4A8kayCv1jlGs7MTv3XJbUosCJhfNpw3ReeHVGfw1KIw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/lefthook-windows-x64": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/lefthook-windows-x64/-/lefthook-windows-x64-1.6.1.tgz", + "integrity": "sha512-poYLk2tfg1Ncr4aZeFuhHjv1qH6f9hX3tV1FOK2MfWkXkRTYPl6MF5h/ONMIv71BsLjGbAA7LNXM5Mj4/B//lQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", diff --git a/package.json b/package.json index 039bd25..5bf96c9 100644 --- a/package.json +++ b/package.json @@ -52,9 +52,10 @@ "@types/react-image-gallery": "^1.2.4", "@vitejs/plugin-react": "^4.2.1", "@vitest/coverage-v8": "^1.2.2", + "lefthook": "^1.6.1", "sass": "^1.70.0", "vite": "^5.1.1", "vite-plugin-sitemap": "^0.5.3", "vitest": "^1.2.2" } -} +} \ No newline at end of file diff --git a/src/components/downloadCard.tsx b/src/components/downloadCard.tsx index e095de5..acf5a87 100644 --- a/src/components/downloadCard.tsx +++ b/src/components/downloadCard.tsx @@ -53,7 +53,7 @@ export default function DownloadCard() { /> {t("sidebar.download_title")}

-
+
-
- +
+
+ +
+ + +
); diff --git a/src/components/logInButton.tsx b/src/components/logInButton.tsx index bbfb7e2..fa871ca 100644 --- a/src/components/logInButton.tsx +++ b/src/components/logInButton.tsx @@ -1,4 +1,4 @@ -import { mdiAccount, mdiLogoutVariant } from "@mdi/js"; +import { mdiAccount, mdiLoginVariant, mdiLogoutVariant } from "@mdi/js"; import Icon from "@mdi/react"; import React, { FC } from "react"; import { Button, Navbar } from "react-bulma-components"; @@ -19,14 +19,14 @@ const LogInButton: FC = ({ inNavBar }) => { if (auth?.authenticated()) { return ( - + {osmUsername} - + - + {t("navbar.logout")} @@ -34,12 +34,14 @@ const LogInButton: FC = ({ inNavBar }) => { ); } return ( - + diff --git a/src/components/map.css b/src/components/map.css index b024cb6..d13f928 100644 --- a/src/components/map.css +++ b/src/components/map.css @@ -1,7 +1,7 @@ .map-wrap { position: absolute; width: 100%; - height: calc(100% - 60px); + height: calc(100% - 56px); /* calculate height of the screen minus the heading */ } @@ -29,7 +29,6 @@ filter: contrast(80%); } -.maplibregl-ctrl-group:not(:empty) -{ - box-shadow: 0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02) +.maplibregl-ctrl-group:not(:empty) { + box-shadow: 0 .5em 1em -.125em rgba(10, 10, 10, .1), 0 0 0 1px rgba(10, 10, 10, .02) } \ No newline at end of file diff --git a/src/components/modal.tsx b/src/components/modal.tsx index edd6eac..dac9b7c 100644 --- a/src/components/modal.tsx +++ b/src/components/modal.tsx @@ -1,4 +1,4 @@ -import { mdiGithub, mdiInformationOutline } from "@mdi/js"; +import { mdiTranslate, mdiGithub, mdiInformationOutline } from "@mdi/js"; import Icon from "@mdi/react"; import React, { FC } from "react"; import { Button, Modal } from "react-bulma-components"; @@ -13,7 +13,7 @@ const ModalContent: FC = () => { const { modalState: { type, currentZoom, errorMessage, nodeId }, } = useAppContext(); - const helpTranslationText = `🖋 ${t("navbar.help_translating")}`; + const helpTranslationText = `${t("navbar.help_translating")}`; switch (type) { case ModalType.NodeAddedSuccessfully: { @@ -80,6 +80,7 @@ const ModalContent: FC = () => { rel="noreferrer" href="https://github.com/openstreetmap-polska/openaedmap-frontend#translating" > + {helpTranslationText}

diff --git a/src/components/navbar.css b/src/components/navbar.css index bbbf975..cae2bd6 100644 --- a/src/components/navbar.css +++ b/src/components/navbar.css @@ -15,9 +15,16 @@ .navbarUrl { color: #effaf5 !important; } + .navbarLogo { width: 35px; height: 35px; fill: #effaf5 !important; - filter: drop-shadow(2px 2px 2px #026841e0); + filter: drop-shadow(2px 2px 2px #18855b); +} + +.navbar .is-outlined.button.button, +#language-switcher { + border-color: #f5f5f5b0; + filter: drop-shadow(2px 2px 2px #18855b); } \ No newline at end of file diff --git a/src/components/navbar.tsx b/src/components/navbar.tsx index a5f3cea..460c2c5 100644 --- a/src/components/navbar.tsx +++ b/src/components/navbar.tsx @@ -1,4 +1,4 @@ -import { mdiMapLegend } from "@mdi/js"; +import { mdiMapLegend, mdiInformationOutline } from "@mdi/js"; import Icon from "@mdi/react"; import React, { FC } from "react"; import { Button, Navbar } from "react-bulma-components"; @@ -19,7 +19,7 @@ const SiteNavbar: FC = ({ toggleSidebarShown }) => { return ( - + = ({ toggleSidebarShown }) => { {/* TODO: extract svg logo */} - + Open AED Map @@ -63,7 +63,9 @@ const SiteNavbar: FC = ({ toggleSidebarShown }) => { CloudFerro - +
+ +
{ @@ -84,9 +86,13 @@ const SiteNavbar: FC = ({ toggleSidebarShown }) => { id="navbarMenu" > +
+ +
- + - - - + - - = ({ toggleSidebarShown }) => { /> = ({ toggleSidebarShown }) => { { ))}
- ); diff --git a/src/components/sidebar-left.tsx b/src/components/sidebar-left.tsx index 20d2e9f..971ef90 100644 --- a/src/components/sidebar-left.tsx +++ b/src/components/sidebar-left.tsx @@ -8,6 +8,8 @@ import DefibrillatorEditor from "./sidebar/defibrillatorEditor"; import PhotoReport from "./sidebar/photoReporter"; import PhotoUpload from "./sidebar/photoUploader"; +const DEBUG = false; + const SidebarLeft: FC = (props) => { const { action, @@ -19,7 +21,13 @@ const SidebarLeft: FC = (props) => { setOpenChangesetId, } = props; - console.log("Opening left sidebar with action: ", action, " and data:", data); + DEBUG && + console.log( + "Opening left sidebar with action: ", + action, + " and data:", + data, + ); if (!visible) return null; diff --git a/src/components/sidebar/defibrillatorDetails.tsx b/src/components/sidebar/defibrillatorDetails.tsx index 5e30283..94842de 100644 --- a/src/components/sidebar/defibrillatorDetails.tsx +++ b/src/components/sidebar/defibrillatorDetails.tsx @@ -98,7 +98,9 @@ const PhotoGallery: FC = ({ diff --git a/src/index.css b/src/index.css index 1883210..446f368 100644 --- a/src/index.css +++ b/src/index.css @@ -1,6 +1,8 @@ html { - overflow-y: hidden !important; /* Hide vertical scrollbar */ - overflow-x: hidden !important; /* Hide horizontal scrollbar */ + overflow-y: hidden !important; + /* Hide vertical scrollbar */ + overflow-x: hidden !important; + /* Hide horizontal scrollbar */ } body { @@ -59,22 +61,21 @@ code { background-color: #7a7a7a !important; } -.navbar-item a:hover -{ +.navbar-item a:hover { color: #000000 !important; } -.column -{ +.column { border-radius: 4px; } -a.navbar-item:focus-within, a.navbar-item:hover { +a.navbar-item:focus-within, +a.navbar-item:hover { background-color: #028955 !important; } #language-switcher { - max-width: 120px; + max-width: 130px; } .maplibregl-ctrl-geocoder { @@ -84,4 +85,8 @@ a.navbar-item:focus-within, a.navbar-item:hover { .partner-row { flex-wrap: wrap; align-items: center !important; +} + +.modal-card { + min-width: 30%; } \ No newline at end of file From eb43021ef48b595e6945a8a4267f1a0dd3a2aeba Mon Sep 17 00:00:00 2001 From: ANCMN Date: Wed, 21 Feb 2024 19:12:47 +0100 Subject: [PATCH 2/5] Update package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 5bf96c9..039bd25 100644 --- a/package.json +++ b/package.json @@ -52,10 +52,9 @@ "@types/react-image-gallery": "^1.2.4", "@vitejs/plugin-react": "^4.2.1", "@vitest/coverage-v8": "^1.2.2", - "lefthook": "^1.6.1", "sass": "^1.70.0", "vite": "^5.1.1", "vite-plugin-sitemap": "^0.5.3", "vitest": "^1.2.2" } -} \ No newline at end of file +} From 251667b78fec04baffd81cddb7629e99b9808305 Mon Sep 17 00:00:00 2001 From: ANCMN Date: Wed, 21 Feb 2024 19:15:56 +0100 Subject: [PATCH 3/5] Update package-lock.json --- package-lock.json | 125 ---------------------------------------------- 1 file changed, 125 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67a5e14..891a6d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,6 @@ "@types/react-image-gallery": "^1.2.4", "@vitejs/plugin-react": "^4.2.1", "@vitest/coverage-v8": "^1.2.2", - "lefthook": "^1.6.1", "sass": "^1.70.0", "vite": "^5.1.1", "vite-plugin-sitemap": "^0.5.3", @@ -3321,130 +3320,6 @@ "node": ">=0.10.0" } }, - "node_modules/lefthook": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook/-/lefthook-1.6.1.tgz", - "integrity": "sha512-1T+tk0V6ubZgiZJGi39QlLMAcgEw+lhoDeSpT3L8Y/f8nUpJW9ntcMOmt+uvMfQ3TVjNcR1r/Lhtm7gTqgdcPg==", - "dev": true, - "hasInstallScript": true, - "bin": { - "lefthook": "bin/index.js" - }, - "optionalDependencies": { - "lefthook-darwin-arm64": "1.6.1", - "lefthook-darwin-x64": "1.6.1", - "lefthook-freebsd-arm64": "1.6.1", - "lefthook-freebsd-x64": "1.6.1", - "lefthook-linux-arm64": "1.6.1", - "lefthook-linux-x64": "1.6.1", - "lefthook-windows-arm64": "1.6.1", - "lefthook-windows-x64": "1.6.1" - } - }, - "node_modules/lefthook-darwin-arm64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.6.1.tgz", - "integrity": "sha512-q6+sYr2Dpt6YnBGXRjMFcXZUnVB97nH+s7EP/tX8m9ewvQxLPqIiUPyAumfyJ2Siomkc5WgAinG+kT63VjUN3A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/lefthook-darwin-x64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-darwin-x64/-/lefthook-darwin-x64-1.6.1.tgz", - "integrity": "sha512-utm7FwtbW8SxGMALIw5/iG4loYS2FI0crDKp/YIamrZgQr6M4pS2C3rxGj5OwiHFIm3arVU+3VZywdvRLJAw0w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/lefthook-freebsd-arm64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.6.1.tgz", - "integrity": "sha512-F2BoDnGznkJyn6lyhmXpu62yq7SMCeHAl3Bl8c+P6mXfmatjjxEpVmrzRuzKMPd/MRGpy2B/glkuyO4wZZazow==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/lefthook-freebsd-x64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.6.1.tgz", - "integrity": "sha512-/NBjMUtnwvdc/p821sfPnZCbWZ6FQkAvnvjoaQu6tkajKZbZYSKsl7UtAicO0nT+79BQFt7TbaZjpua2T9tM5w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/lefthook-linux-arm64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-linux-arm64/-/lefthook-linux-arm64-1.6.1.tgz", - "integrity": "sha512-ke+2ni/bmxgYJSRsH+uIYYfTLj2It7WP+mcF4rfJHRbzn5yDYIjFgylUMC2CgW5urS4DSbxcRIbAqLY3OXAHnw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/lefthook-linux-x64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-linux-x64/-/lefthook-linux-x64-1.6.1.tgz", - "integrity": "sha512-/HLkl9jt3XRjT0RPaLpAgUQmvp4zV/KKZ/8x6xslPl89krv3ZkHKKrqeaHdhiengq3hzx3N+KbOfFcxBRzdT6A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/lefthook-windows-arm64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-windows-arm64/-/lefthook-windows-arm64-1.6.1.tgz", - "integrity": "sha512-RyQ8S4/45BpJpRPy7KsOuJeXQ5FOa7MASoPtOYvrXt4A8kayCv1jlGs7MTv3XJbUosCJhfNpw3ReeHVGfw1KIw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/lefthook-windows-x64": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/lefthook-windows-x64/-/lefthook-windows-x64-1.6.1.tgz", - "integrity": "sha512-poYLk2tfg1Ncr4aZeFuhHjv1qH6f9hX3tV1FOK2MfWkXkRTYPl6MF5h/ONMIv71BsLjGbAA7LNXM5Mj4/B//lQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", From 94358a2b750989716e3c0bfd8a3a4e797769b4b6 Mon Sep 17 00:00:00 2001 From: Filip Czaplicki Date: Wed, 21 Feb 2024 19:34:09 +0100 Subject: [PATCH 4/5] Sort imports --- src/components/modal.tsx | 2 +- src/components/navbar.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/modal.tsx b/src/components/modal.tsx index dac9b7c..83fa119 100644 --- a/src/components/modal.tsx +++ b/src/components/modal.tsx @@ -1,4 +1,4 @@ -import { mdiTranslate, mdiGithub, mdiInformationOutline } from "@mdi/js"; +import { mdiGithub, mdiInformationOutline, mdiTranslate } from "@mdi/js"; import Icon from "@mdi/react"; import React, { FC } from "react"; import { Button, Modal } from "react-bulma-components"; diff --git a/src/components/navbar.tsx b/src/components/navbar.tsx index 460c2c5..6cbc059 100644 --- a/src/components/navbar.tsx +++ b/src/components/navbar.tsx @@ -1,4 +1,4 @@ -import { mdiMapLegend, mdiInformationOutline } from "@mdi/js"; +import { mdiInformationOutline, mdiMapLegend } from "@mdi/js"; import Icon from "@mdi/react"; import React, { FC } from "react"; import { Button, Navbar } from "react-bulma-components"; From 56a9ea74077465b6bfc0ebbe9d78359b9964228f Mon Sep 17 00:00:00 2001 From: Filip Czaplicki Date: Wed, 21 Feb 2024 19:45:04 +0100 Subject: [PATCH 5/5] Remove log message. Simplify --- src/components/modal.tsx | 3 +-- src/components/sidebar-left.tsx | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/components/modal.tsx b/src/components/modal.tsx index 83fa119..ff0380d 100644 --- a/src/components/modal.tsx +++ b/src/components/modal.tsx @@ -13,7 +13,6 @@ const ModalContent: FC = () => { const { modalState: { type, currentZoom, errorMessage, nodeId }, } = useAppContext(); - const helpTranslationText = `${t("navbar.help_translating")}`; switch (type) { case ModalType.NodeAddedSuccessfully: { @@ -81,7 +80,7 @@ const ModalContent: FC = () => { href="https://github.com/openstreetmap-polska/openaedmap-frontend#translating" > - {helpTranslationText} + {t("navbar.help_translating")}