Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Draft] Upgrade to qwc2 lts2024 #3

Draft
wants to merge 20 commits into
base: master
Choose a base branch
from
+11,445 −330
Draft

[Draft] Upgrade to qwc2 lts2024 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
786e30a
Docker compose for local dev purposes
piMoll Nov 19, 2024
29aa422
Add utilities for dev work, save current config,themes,themesConfig.j…
piMoll Nov 22, 2024
5e1bf0b
Upgrade SearchProviders.js
piMoll Nov 22, 2024
257a65d
use themes.json of test env, not prod
piMoll Nov 22, 2024
6bba343
Fix paths in docker compose
piMoll Nov 22, 2024
57264f7
Upgrade config.json
piMoll Nov 22, 2024
ab3a2c2
Add a bit more info about nginx proxy
piMoll Nov 25, 2024
24f8404
Upgrade index.html
piMoll Nov 25, 2024
610a5b5
Replace raster export plugin with map export plugin in config.json
piMoll Nov 25, 2024
3272177
Make sure the mobile config is same as before
piMoll Nov 25, 2024
a38ba83
Remove bookmarks config entry
piMoll Nov 25, 2024
baa6687
Activate docker image push and use updated qwc2_minimal (nightly) as …
piMoll Nov 28, 2024
c87f3e4
Add some missed config changes
piMoll Dec 5, 2024
5f704ec
Update image hash to point at latest nightly of qwc2_minimal
piMoll Dec 5, 2024
6396a8d
Add readme to explain dev setup
piMoll Dec 5, 2024
5fbbee1
Remove "QWC2 Demo" link in bottom bar
piMoll Dec 12, 2024
1f5fa91
Remove dxf export options in map export plugin, prerequisites in qgis…
piMoll Dec 12, 2024
0882d28
Add new link in bottom bar to a references / release notes page
piMoll Dec 16, 2024
b14cce0
Exclude DXF export option from map export
piMoll Dec 17, 2024
4f47a1c
Point at 2024-lts image of qwc2-minimal
piMoll Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
with:
context: ./
# do not push for the moment, to avoid load
# push: true
push: true
tags: ghcr.io/${{ github.repository }}:${{ github.head_ref }}-${{ github.sha }}
target: prod
15 changes: 14 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
FROM ghcr.io/opengisch/qwc2_minimal-qwc2-minimal-builder:v1.0.1 as builder
FROM ghcr.io/opengisch/qwc2_minimal-qwc2-minimal-builder:2024-lts.0 as builder

COPY ./app/js/Help.jsx /app/js/Help.jsx
COPY ./app/js/SearchProviders.js /app/js/SearchProviders.js
COPY ./app/index.html /app/index.html
COPY ./app/static/translations/cs-CZ_overrides.json /app/static/translations/cs-CZ_overrides.json
COPY ./app/static/translations/de-CH_overrides.json /app/static/translations/de-CH_overrides.json
COPY ./app/static/translations/de-DE_overrides.json /app/static/translations/de-DE_overrides.json
COPY ./app/static/translations/en-US_overrides.json /app/static/translations/en-US_overrides.json
COPY ./app/static/translations/es-ES_overrides.json /app/static/translations/es-ES_overrides.json
COPY ./app/static/translations/fr-FR_overrides.json /app/static/translations/fr-FR_overrides.json
COPY ./app/static/translations/it-IT_overrides.json /app/static/translations/it-IT_overrides.json
COPY ./app/static/translations/pl-PL_overrides.json /app/static/translations/pl-PL_overrides.json
COPY ./app/static/translations/pt-BR_overrides.json /app/static/translations/pt-BR_overrides.json
COPY ./app/static/translations/ro-RO_overrides.json /app/static/translations/ro-RO_overrides.json
COPY ./app/static/translations/ru-RU_overrides.json /app/static/translations/ru-RU_overrides.json
COPY ./app/static/translations/sv-SE_overrides.json /app/static/translations/sv-SE_overrides.json
COPY ./app/static/translations/tr-TR_overrides.json /app/static/translations/tr-TR_overrides.json

WORKDIR /app

Expand Down
13 changes: 13 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# WebGIS Thalwil

## Local DEV setup
Run the docker compose file to fire up a local instance of the webGIS. It mounts the contents of
the app folder and also the configuration files copied from Thalwil TEST env (themes.json, config.json).


### Prevent CORS issues
To prevent CORS issues, the following automatic and manual steps are taken.

- Search: A proxy service in the docker compose redirects search requests from localhost:8888 to the TEST env
- Map click / feature info: In themes.json, replace `"featureInfoUrl": "https://maps-test.thalwil.ch` with `"featureInfoUrl": "http://localhost:8888` to point at the proxy
- Theme and basemap thumbnails: These still suffer from CORS blocks, no solution yet
4 changes: 3 additions & 1 deletion app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>Thalwil webGIS</title>
<link rel="stylesheet" type="text/css" href="assets/css/qwc2.css" />
<link rel="stylesheet" type="text/css" href="assets/css/colorschemes.css" />
<link rel="apple-touch-icon" href="assets/img/app_icon.png"/>
<link rel="apple-touch-icon" sizes="72x72" href="assets/img/app_icon_72.png"/>
<link rel="apple-touch-icon" sizes="114x114" href="assets/img/app_icon_114.png"/>
Expand Down Expand Up @@ -49,12 +50,13 @@
}
}
</style>
<!-- <script type="text/javascript" src="assets/searchProviders.js" ></script>-->
<script type="text/javascript">
window.addEventListener("load", function(ev) {
document.getElementById('splash').style.display = 'none';
}, false);
</script>
<!--<script type="text/javascript" src="api_examples.js"></script>-->
<!-- <script type="text/javascript" src="api_examples.js"></script>-->
</head>
<body>
<div id="splash"><div class="lds-dual-ring"></div></div>
Expand Down
7 changes: 5 additions & 2 deletions app/js/Help.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ export function renderHelp() {
</div>
<div>QWC2 build {process.env.BuildDate}</div>
<div>
<a href={process.env.QWC2RepoSource}>Verwendete QWC2 Version</a>
<a href={process.env.QWC2RepoSource} target="_blank">Verwendete QWC2 Version</a>
</div>
<div>
<a href="https://qwc-services.github.io/master/release_notes/ChangeLog/" target="_blank">Changelog</a>
</div>
</div>
);
}
}
Loading
Loading