Merged in stage (pull request #21)

release 0.4.0

Author: yvess

Makefile

@@ -1,6 +1,5 @@
 SHELL = /bin/bash
-
-.PHONY: all
+.PHONY: tests
 
 init:
 	cd django && make init
@@ -41,7 +40,7 @@ deploy_dev:
 
 deploy_local:
 	docker-compose up -d
-	make -f vue/Makefile build
+	make -f vue/Makefile build-cron
 	source env.hosts.prod && rsync -av --delete vue/dist $$VUE_LOCAL_PATH
 	docker-compose exec -T django make migrate
 	docker-compose exec -T django killall -TERM gunicorn
@@ -63,3 +62,7 @@ dump-db:
 
 import-db:
 	@docker-compose exec pdb sh -c 'psql -U $$POSTGRES_USER $$POSTGRES_DB < /var/services/postgres/var/dump.sql'
+
+tests:
+	cd django && make tests
+	cd vue && make tests

README.md

@@ -12,12 +12,20 @@ The current tech stack of this project is:
 - Wagtail
 - Docker
 
+# Releases
+
+*See [RELEASE.md](/RELEASE.md)*
+
 # Developer guide
 
 :construction:
 
+For a tour of the app and a testing protocol see [`docs/testing.md`](/docs/testing.md).
+
 ## setup project
 
+Add `django` to the 127.0.0.1 entry in `/etc/hosts` (for screenshot service).
+
 ```bash
 touch env.hosts.prod # required file, can be empty and edited later
 ```
@@ -89,5 +97,8 @@ Type `make deploy_prod` in the project root. The file `env.hosts.prod` needs to
 
 ## additional docs
 
-- [grahpql](/docs/graphql.md)
 - [architecture](/docs/architecture.md)
+- [django](/docs/django.md)
+- [links](/docs/links.md)
+- [grahpql](/docs/graphql.md)
+- [troubleshooting](/docs/troubleshooting.md)

RELEASE.md

@@ -1,16 +1,60 @@
 # Release Notes
 
-The latest supported release is [TBD]
+## Releases
 
-## Latest updates
+### 0.3.1
+[Released: *2020-04-09*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.3.1)
+[Sprint: 4 "Out of the Box"](https://bitbucket.org/cividi/gemeindescan-webui/issues?milestone=SP+4%3A+Out+of+the+box)
 
-You can download the latest updates from https://bitbucket.org/cividi/gemeindescan-webui/src
+- Small fixes
 
-## Sprint 0: Project setup
+### 0.3.0 "Out of the Box"
+[Released: *2020-04-09*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.3.0)
+[Sprint: 4 "Out of the Box"](https://bitbucket.org/cividi/gemeindescan-webui/issues?milestone=SP+4%3A+Out+of+the+box)
 
-[Bitbucket issues](https://bitbucket.org/cividi/gemeindescan-webui/issues?status=new&status=open&milestone=Sprint%200%3A%20Project%20setup) - until 10.1.2020
+- Workspace support
+- Improved layouts
+- Improved deployment
+- Improved JSON editor in Django-Admin
+- Experimental branch: automatic screenshot generator
 
-TODO: what is in this release, bullet points.
+### 0.2.1
+[Released: *2020-03-16*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.2.1)
+[Sprint: 3 "Hello World"](https://bitbucket.org/cividi/gemeindescan-webui/issues?milestone=SP+3%3A+Hello+world)
+
+- Legend is now using SVG rendering
+- Small fixes
+
+### 0.2.0 "Hello World"
+[Released: *2020-03-11*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.2.0)
+[Sprint: 3 "Hello World"](https://bitbucket.org/cividi/gemeindescan-webui/issues?milestone=SP+3%3A+Hello+world)
+
+- SnapshotView support according to [Gemeindescan Datapackage Specification](https://bitbucket.org/cividi/gemeindescan-sample/)
+- Based on Leaflet and [Simple Style GeoJSON](https://github.com/mapbox/simplestyle-spec)
+- Support for [Simple Style GeoJSON](https://github.com/mapbox/simplestyle-spec) and Leaflet Circles
+- Support for Legends
+- GeoDjango added
+
+### 0.1.2
+[Released: *2020-02-20*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.1.2)
+[Sprint: 2 "Map Space"](https://bitbucket.org/cividi/gemeindescan-webui/issues?milestone=SP+2%3A+Map+space)
+
+- Multilanguage support via [`vue-i18n`](https://github.com/kazupon/vue-i18n)
+- Improved docker setup
+- Experimental: snapshot view
+
+### 0.1.1
+[Released: *2020-02-13*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.1.1)
+[Sprint: 2 "Map Space"](https://bitbucket.org/cividi/gemeindescan-webui/issues?milestone=SP+2%3A+Map+space)
+
+- Static content updates
+
+### 0.1.0
+[Released: *2020-02-06*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.1.0)
+[Sprint: 0 "Project Setup" + Sprint 1 "Splash Down"](https://bitbucket.org/cividi/gemeindescan-webui/issues?milestone=SP+1%3A+Splash+down&milestone=SP+0%3A+Project+setup)
+
+- Initial version
+- Django + Graphene + GraphQL + Vue setup
 
 ## See also
 

django/Makefile

@@ -1,6 +1,6 @@
-GEMEINDESCAN_WEBUI_DJANGO=0.3.3
+GEMEINDESCAN_WEBUI_DJANGO=0.3.4
 DOCKER_EXEC=$(shell command -v docker > /dev/null && echo "docker-compose exec django")
-
+all: run-tests run-tests-dev
 .PHONY: all
 default: dev
 
@@ -29,6 +29,12 @@ migrate:
 	$(DOCKER_EXEC) python3 manage.py migrate
 	make collectstatic
 
+tests:
+	$(DOCKER_EXEC) pytest --create-db
+
+tests-dev:
+	$(DOCKER_EXEC) pytest --reuse-db -vvv --nomigrations
+
 delete-gemeinden-django:
 	$(DOCKER_EXEC) python3 manage.py shell --command="from gsmap.models import Municipality;Municipality.objects.all().delete()"
 

django/conftest.py

@@ -0,0 +1,11 @@
+import pytest
+
+from django.core.management import call_command
+
+@pytest.fixture(scope='session')
+def django_db_setup(django_db_setup, django_db_blocker):
+    with django_db_blocker.unblock():
+        call_command('loaddata', 'fixtures-tests/sites.site.json')
+        call_command('loaddata', 'fixtures-tests/gsuser.user.json')
+        call_command('loaddata', 'fixtures-tests/gsmap.municipality.json')
+        call_command('loaddata', 'fixtures-tests/gsmap.snapshot.json')

django/docker/django/requirements/02.txt

@@ -42,6 +42,7 @@ pylint-django==2.0.13
 pylint-plugin-utils==0.6
 pyparsing==2.4.6
 pytest==5.3.5
+pytest-django==3.9.0
 pytz==2019.3
 requests==2.23.0
 Rx==1.6.1

django/fixtures-tests/gsmap.municipality.json

@@ -0,0 +1 @@
+[{"model": "gsuser.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$180000$0wINEkSnlTLQ$cKkWUQGHdT4/pT9KcNzOZ+XS0LNw8Wx4VF4tuZ1oXkE=", "last_login": "2020-05-10T16:16:58.410Z", "is_superuser": true, "username": "admin", "first_name": "", "last_name": "", "email": "[email protected]", "is_staff": true, "is_active": true, "date_joined": "2020-05-10T16:11:16.244Z", "groups": [], "user_permissions": []}}]

django/fixtures-tests/gsmap.snapshot.json

@@ -0,0 +1 @@
+[{"model": "sites.site", "pk": 1, "fields": {"domain": "localhost:8081", "name": "localhost:8081"}}]