Skip to content

Commit

Permalink
Updated client after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
elpaso committed Aug 6, 2020
1 parent de83d28 commit a8e033c
Show file tree
Hide file tree
Showing 33 changed files with 170 additions and 85 deletions.
2 changes: 1 addition & 1 deletion python/server/auto_generated/qgsserverstatichandler.sip.in
Expand Up @@ -22,7 +22,7 @@ The QgsServerStaticHandler class serves static files from the static path (resou
%End
public:

QgsServerStaticHandler( const QString &pathRegExp = QStringLiteral( R"re(/static/(?<staticFilePath>.*)$)re" ), const QString &staticPathSuffix = QString( ) );
QgsServerStaticHandler( const QString &pathRegExp = QStringLiteral( "/static/(?<staticFilePath>.*)$" ), const QString &staticPathSuffix = QString( ) );
%Docstring
Creates QgsServerStaticHandler

Expand Down
3 changes: 3 additions & 0 deletions resources/server/api/ogc/static/landingpage/README
@@ -0,0 +1,3 @@
Source code for the client HTML/JS code is available at:

https://github.com/elpaso/qgis-server-landing-page-plugin

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Binary file modified resources/server/api/ogc/static/landingpage/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/server/api/ogc/static/landingpage/index.html
@@ -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-17be74ed.d8e3c767.css rel=prefetch><link href=/css/chunk-78671b57.a2bc3c6b.css rel=prefetch><link href=/css/chunk-a84730f4.d8136b79.css rel=prefetch><link href=/js/chunk-17be74ed.28f97f46.js rel=prefetch><link href=/js/chunk-78671b57.5200390a.js rel=prefetch><link href=/js/chunk-a84730f4.db1de6e9.js rel=prefetch><link href=/css/app.ca3f5643.css rel=preload as=style><link href=/css/chunk-vendors.4f60a56b.css rel=preload as=style><link href=/js/app.c7284a81.js rel=preload as=script><link href=/js/chunk-vendors.a274ab4b.js rel=preload as=script><link href=/css/chunk-vendors.4f60a56b.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.a274ab4b.js></script><script src=/js/app.c7284a81.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-144cd10c.61ac68ab.css rel=prefetch><link href=/css/chunk-4bb3b66a.82255eb1.css rel=prefetch><link href=/js/chunk-123bc409.ef3c4d35.js rel=prefetch><link href=/js/chunk-144cd10c.517e8bc2.js rel=prefetch><link href=/js/chunk-4bb3b66a.7a48f55d.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.ca7d8a76.js rel=preload as=script><link href=/js/chunk-vendors.ebebb286.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.ebebb286.js></script><script src=/js/app.ca7d8a76.js></script></body></html>

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3 comments on commit a8e033c

@jgrocha
Copy link
Member

@jgrocha jgrocha commented on a8e033c Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @elpaso

Thanks for the work done on the landing page. It is really useful and a major advantage regarding other OGC complaint servers.

I think you should include the landing page source in QGIS sources. If the landing page works as a plugin to be installed by the user, the sources can be kept in your repo. But soon as it lands in QGIS and it is installed along with QGIS Server, I think the sources should also be included here..

What do you think?

@elpaso
Copy link
Contributor Author

@elpaso elpaso commented on a8e033c Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jgrocha no objections from my side, please go ahead!

To make it even better you could make a workflow that rebuilds the sources on every changes, there is a docker for that, see: https://github.com/elpaso/qgis-server-landing-page-plugin#building

The documentation of the API is also completely missing, it would be nice to add it.

As a side note, all this development was completely volunteer time, nobody funded it so I cannot really ask anyone for funding the boring side of the work.

Also, for local development, the https://github.com/elpaso/qgis-server-landing-page-plugi still provides the landing page as a Python plugin, it is very convenient but you need to disable the core landing page, there is an env var to do that.

@jgrocha
Copy link
Member

@jgrocha jgrocha commented on a8e033c Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the feedback @elpaso

I really appreciate your work here. I'm trying to follow what you have been done. I'll do my best to document it, to let others take advantage of the existing support.

Please sign in to comment.