Skip to content
Permalink
Browse files
Merge pull request #43104 from elpaso/server-landingpage-custom-prefix
Server landingpage custom prefix
  • Loading branch information
elpaso committed May 17, 2021
2 parents 413d3ae + d8a155b commit 7ae1b318731fda9a98f29bb8d795a274d7ab0124
Showing with 196 additions and 48 deletions.
  1. +8 −0 python/server/auto_generated/qgsserversettings.sip.in
  2. 0 ...server/api/ogc/static/landingpage/css/{chunk-123bc409.4bfbed8f.css → chunk-123bc409.8679d8ba.css}
  3. +1 −1 ...server/api/ogc/static/landingpage/css/{chunk-06c8fa3c.09a55b1d.css → chunk-23874add.0889ca49.css}
  4. +1 −1 ...server/api/ogc/static/landingpage/css/{chunk-744799cf.1912e150.css → chunk-a28d6c70.162a27d1.css}
  5. +1 −1 resources/server/api/ogc/static/landingpage/index.html
  6. +0 −2 resources/server/api/ogc/static/landingpage/js/app.d879e77e.js
  7. +0 −1 resources/server/api/ogc/static/landingpage/js/app.d879e77e.js.map
  8. +2 −0 resources/server/api/ogc/static/landingpage/js/app.fc7d2f48.js
  9. +1 −0 resources/server/api/ogc/static/landingpage/js/app.fc7d2f48.js.map
  10. +0 −2 resources/server/api/ogc/static/landingpage/js/chunk-06c8fa3c.50ef961b.js
  11. +0 −1 resources/server/api/ogc/static/landingpage/js/chunk-06c8fa3c.50ef961b.js.map
  12. +1 −1 ...es/server/api/ogc/static/landingpage/js/{chunk-123bc409.9a0f8895.js → chunk-123bc409.ec41f71a.js}
  13. +1 −1 ...r/api/ogc/static/landingpage/js/{chunk-123bc409.9a0f8895.js.map → chunk-123bc409.ec41f71a.js.map}
  14. +2 −0 resources/server/api/ogc/static/landingpage/js/chunk-23874add.1912a0b5.js
  15. +1 −0 resources/server/api/ogc/static/landingpage/js/chunk-23874add.1912a0b5.js.map
  16. +0 −2 resources/server/api/ogc/static/landingpage/js/chunk-744799cf.c9f7ef26.js
  17. +2 −0 resources/server/api/ogc/static/landingpage/js/chunk-a28d6c70.7ed0c6db.js
  18. +1 −1 ...r/api/ogc/static/landingpage/js/{chunk-744799cf.c9f7ef26.js.map → chunk-a28d6c70.7ed0c6db.js.map}
  19. +1 −1 ...rces/server/api/ogc/static/landingpage/js/{chunk-vendors.450afea6.js → chunk-vendors.573fc8d0.js}
  20. +1 −1 ...ver/api/ogc/static/landingpage/js/{chunk-vendors.450afea6.js.map → chunk-vendors.573fc8d0.js.map}
  21. +1 −1 resources/server/src/landingpage/public/index.html
  22. +2 −2 resources/server/src/landingpage/src/components/AttributeTable.vue
  23. +3 −4 resources/server/src/landingpage/src/store.js
  24. +2 −2 resources/server/src/landingpage/src/views/Catalog.vue
  25. +2 −2 resources/server/src/landingpage/src/views/WebGis.vue
  26. +3 −1 resources/server/src/landingpage/vue.config.js
  27. +5 −5 src/server/qgsserverogcapi.cpp
  28. +17 −0 src/server/qgsserversettings.cpp
  29. +7 −0 src/server/qgsserversettings.h
  30. +32 −9 src/server/services/landingpage/qgslandingpage.cpp
  31. +38 −2 src/server/services/landingpage/qgslandingpagehandlers.cpp
  32. +9 −2 src/server/services/landingpage/qgslandingpagehandlers.h
  33. +51 −2 tests/src/python/test_qgsserver_landingpage.py
@@ -58,6 +58,7 @@ Provides some enum describing the environment currently supported for configurat
QGIS_SERVER_WFS_SERVICE_URL,
QGIS_SERVER_WCS_SERVICE_URL,
QGIS_SERVER_WMTS_SERVICE_URL,
QGIS_SERVER_LANDING_PAGE_PREFIX,
};
};

@@ -226,6 +227,13 @@ service to find projects. Multiple connections can be specified by
separating them with '||'.

.. versionadded:: 3.16
%End

QString landingPageBaseUrlPrefix() const;
%Docstring
Returns the landing page base URL regular expression, defaults to `/`.

.. versionadded:: 3.20
%End

QString apiResourcesDirectory() const;

Some generated files are not rendered by default. Learn more.

Large diffs are not rendered by default.

@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel=icon href=/favicon.ico><title>app</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/css/chunk-06c8fa3c.09a55b1d.css rel=prefetch><link href=/css/chunk-123bc409.4bfbed8f.css rel=prefetch><link href=/css/chunk-744799cf.1912e150.css rel=prefetch><link href=/js/chunk-06c8fa3c.50ef961b.js rel=prefetch><link href=/js/chunk-123bc409.9a0f8895.js rel=prefetch><link href=/js/chunk-744799cf.c9f7ef26.js rel=prefetch><link href=/css/app.ca3f5643.css rel=preload as=style><link href=/css/chunk-vendors.a728f495.css rel=preload as=style><link href=/js/app.d879e77e.js rel=preload as=script><link href=/js/chunk-vendors.450afea6.js rel=preload as=script><link href=/css/chunk-vendors.a728f495.css rel=stylesheet><link href=/css/app.ca3f5643.css rel=stylesheet></head><body><noscript><strong>We're sorry but app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.450afea6.js></script><script src=/js/app.d879e77e.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel=icon href=./favicon.ico><title>app</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=css/chunk-123bc409.8679d8ba.css rel=prefetch><link href=css/chunk-23874add.0889ca49.css rel=prefetch><link href=css/chunk-a28d6c70.162a27d1.css rel=prefetch><link href=js/chunk-123bc409.ec41f71a.js rel=prefetch><link href=js/chunk-23874add.1912a0b5.js rel=prefetch><link href=js/chunk-a28d6c70.7ed0c6db.js rel=prefetch><link href=css/app.ca3f5643.css rel=preload as=style><link href=css/chunk-vendors.a728f495.css rel=preload as=style><link href=js/app.fc7d2f48.js rel=preload as=script><link href=js/chunk-vendors.573fc8d0.js rel=preload as=script><link href=css/chunk-vendors.a728f495.css rel=stylesheet><link href=css/app.ca3f5643.css rel=stylesheet></head><body><noscript><strong>We're sorry but app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.573fc8d0.js></script><script src=js/app.fc7d2f48.js></script></body></html>

This file was deleted.

This file was deleted.

0 comments on commit 7ae1b31

Please sign in to comment.