Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Server landingpage makes good use of initial extent
  • Loading branch information
elpaso committed Aug 17, 2020
1 parent 80e7fd8 commit d0fcbec
Show file tree
Hide file tree
Showing 15 changed files with 2,456 additions and 2,380 deletions.

This file was deleted.

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-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>
<!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-fd085c1c.a76e3223.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-fd085c1c.83a1da86.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.e63a21da.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.e63a21da.js></script></body></html>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

13 changes: 6 additions & 7 deletions tests/src/python/test_qgsserver_landingpage.py
Expand Up @@ -58,19 +58,18 @@ def setUpClass(cls):
cls.temp_dir = QtCore.QTemporaryDir()

temp_dir = cls.temp_dir.path()
cls.directories = [os.path.join(temp_dir, 'landingpage', 'projects'), os.path.join(temp_dir, 'landingpage', 'projects2')]
shutil.copytree(os.path.join(unitTestDataPath('qgis_server'), 'landingpage'), os.path.join(temp_dir, 'landingpage'))

directories = [os.path.join(temp_dir, 'landingpage', 'projects'), os.path.join(temp_dir, 'landingpage', 'projects2')]
os.environ['QGIS_SERVER_PROJECTS_DIRECTORIES'] = '||'.join(directories)

if not os.environ.get('TRAVIS', False):
os.environ['QGIS_SERVER_PROJECTS_PG_CONNECTIONS'] = "postgresql://localhost:5432?sslmode=disable&dbname=landing_page_test&schema=public"

def setUp(self):
"""Clean env"""
"""Setup env"""

super().setUp()
os.environ["QGIS_SERVER_DISABLED_APIS"] = ''
os.environ['QGIS_SERVER_PROJECTS_DIRECTORIES'] = '||'.join(self.directories)

if not os.environ.get('TRAVIS', False):
os.environ['QGIS_SERVER_PROJECTS_PG_CONNECTIONS'] = "postgresql://localhost:5432?sslmode=disable&dbname=landing_page_test&schema=public"

def test_landing_page_redirects(self):
"""Test landing page redirects"""
Expand Down

0 comments on commit d0fcbec

Please sign in to comment.