From c5ef64c5d2bc6b182a0f6bd3644fd4359a5d2fae Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 3 May 2025 22:56:05 +0200 Subject: [PATCH] UI: improve app landing page, add translations --- app/AppIndex.svelte | 47 ++++++++++++++++++++++++++++++----------- app/build_and_deploy.sh | 10 ++++++--- langs/en.json | 7 ++++++ langs/layers/it.json | 2 +- langs/nl.json | 7 ++++++ 5 files changed, 57 insertions(+), 16 deletions(-) diff --git a/app/AppIndex.svelte b/app/AppIndex.svelte index 0accefe8f..f50f489fd 100644 --- a/app/AppIndex.svelte +++ b/app/AppIndex.svelte @@ -1,19 +1,42 @@ -
-

MapComplete Android App

+ + + <Tr t={t.title} /> + - MapComplete is available as Android App as direct download. We are working on publishing this in - the play store and on FDroid too. +
+
- - - Download the latest version - - Go back to mapcomplete + +
+
+
+

+ +

+ + + + + + + + + + + + +
+
diff --git a/app/build_and_deploy.sh b/app/build_and_deploy.sh index fffe3f769..0c0b9c7ed 100755 --- a/app/build_and_deploy.sh +++ b/app/build_and_deploy.sh @@ -1,5 +1,5 @@ #! /bin/bash - +# To be run from app directory nvm use export NODE_OPTIONS="--max-old-space-size=8192" @@ -8,12 +8,16 @@ npm run build:vite:app-landing mkdir to_upload mv dist/app/* to_upload/ cp -r .well-known/ to_upload/ -mkdir -p to_upload/assets +mkdir -p to_upload/assets/fonts + +cp ../public/css/index-tailwind-output.css to_upload/assets/ +cp ../public/assets/fonts/source-sans-pro.regular.ttf to_upload/assets/fonts/ + cp dist/assets/*.js to_upload/assets/ rm -rf dist ssh hetzner "rm -rf /root/app/" scp -rp to_upload/ hetzner:/root/app/ scp -rp to_upload/.well-known/ hetzner:/root/app/ -ssh hetzner "cp ~/apk/mapcomplete-latest.apk ~/app/" +ssh hetzner "cp ~/public/apk/mapcomplete-latest.apk ~/app/" rm -rf to_upload diff --git a/langs/en.json b/langs/en.json index 9b8757369..b640d56e1 100644 --- a/langs/en.json +++ b/langs/en.json @@ -2,6 +2,13 @@ "advanced": { "title": "Advanced features" }, + "app": { + "back": "Go back to MapComplete", + "download": "Download the app", + "intro": "MapComplete is available as Android App as direct download. We are working on publishing this in on FDroid too.", + "older": "See older builds", + "title": "MapComplete Anrdoid App" + }, "centerMessage": { "allFilteredAway": "No feature in view meets all filters", "loadingData": "Loading data…", diff --git a/langs/layers/it.json b/langs/layers/it.json index deb4615af..1a1a09674 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -14637,4 +14637,4 @@ "render": "turbina eolica" } } - } \ No newline at end of file +} \ No newline at end of file diff --git a/langs/nl.json b/langs/nl.json index cf75252ae..57e0b6fa8 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -2,6 +2,13 @@ "advanced": { "title": "Geavanceerde functies" }, + "app": { + "back": "Ga terug naar MapComplete", + "download": "Download de laatste versie", + "intro": "MapComplete is beschikbaar als Android App. Deze is binnenkort ook in F-Droid beschikbaar", + "older": "Bekijk oudere versies", + "title": "MapComplete Anrdoid App" + }, "centerMessage": { "allFilteredAway": "Geen enkel kaart-object voldoet aan alle filters", "loadingData": "Data worden geladen …",