Merge branch 'master' into release/0.1.x

Author: yvess

.gitattributes

@@ -1 +1 @@
-* text eol=lf
+*.vue text eol=lf

Makefile

@@ -27,18 +27,21 @@ deploy_prod:
 	source env.hosts.prod && ssh $$DJANGO_PROD_HOST -t "cd $$DJANGO_PROD_PATH && COMPOSE_FILE=$$COMPOSE_PROD docker-compose up -d"
 	source env.hosts.prod && rsync -av --delete vue/dist $$DJANGO_PROD_HOST:$$VUE_PROD_PATH
 	source env.hosts.prod && ssh $$DJANGO_PROD_HOST -t "cd $$DJANGO_PROD_PATH && COMPOSE_FILE=$$COMPOSE_PROD docker-compose exec django make migrate"
-	source env.hosts.prod && ssh $$DJANGO_PROD_HOST -t "cd $$DJANGO_PROD_PATH && COMPOSE_FILE=$$COMPOSE_PROD docker-compose exec django killall -TERM uvicorn"
+	source env.hosts.prod && ssh $$DJANGO_PROD_HOST -t "cd $$DJANGO_PROD_PATH && COMPOSE_FILE=$$COMPOSE_PROD docker-compose exec django killall -TERM gunicorn"
 
 deploy_dev:
 	cd vue && make build
 	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && git pull -v"
 	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && COMPOSE_FILE=$$COMPOSE_DEV docker-compose up -d"
 	source env.hosts.prod && rsync -av --delete vue/dist $$DJANGO_DEV_HOST:$$VUE_DEV_PATH
-	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && COMPOSE_FILE=$$COMPOSE_DEV docker-compose exec django ls"
-	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && COMPOSE_FILE=$$COMPOSE_DEV docker-compose exec django killall -TERM uvicorn"
+	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && COMPOSE_FILE=$$COMPOSE_DEV docker-compose exec django make migrate"
+	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && COMPOSE_FILE=$$COMPOSE_DEV docker-compose exec django killall -TERM gunicorn"
 
 ab-graphql:
 	ab -p tests/graphql-autocomplete-post.json -T application/json -c 10 -n 2000 http://gemeindescan.ch/graphql/
 
 ab-html:
 	ab -c 10 -n 2000 http://gemeindescan.ch/
+
+dump-db:
+	@docker-compose exec pdb sh -c 'pg_dump --no-owner --no-acl --schema=public -U $$POSTGRES_USER $$POSTGRES_DB'

README.md

@@ -1,4 +1,20 @@
-# gemeindescan-webui
+# Gemeindescan Web UI
+
+Web application under heavy development. For more information, please visit https://cividi.ch
+
+The current tech stack of this project is:
+
+- Vuetify
+- Vue.js
+- GraphQL
+- Graphene
+- Django
+- Wagtail
+- Docker
+
+# Developer guide
+
+:construction:
 
 ## setup project
 
@@ -53,7 +69,7 @@ make up
 make init
 ```
 
-if `make init` doesn't work you can execute the commands one by one. 
+if `make init` doesn't work you can execute the commands one by one.
 
 ```bash
 # go into django container
@@ -74,16 +90,16 @@ ln -s /node_modules ./
 make up
 ```
 
-### editor 
+### editor
 
 The project is setup to work with visual studio code as editor. Any other editor is also fine.
-With vscode the plugins are automatically installed and linting and autocomplete works out of the box, 
-with the data from inside the container. 
+With vscode the plugins are automatically installed and linting and autocomplete works out of the box,
+with the data from inside the container.
 
-You need to have installed the vscode extension `Remote - Containers` in your local vscode installation. 
+You need to have installed the vscode extension `Remote - Containers` in your local vscode installation.
 
 You need to start two editors with `code vue` and `code django` (install code command in path from vscode).
-After they started you need to click on `reopen in container` (first time start takes a bit longer to install plugins). 
+After they started you need to click on `reopen in container` (first time start takes a bit longer to install plugins).
 
 #### vue vscode
 

django/Makefile

@@ -1,4 +1,4 @@
-GEMEINDESCAN_WEBUI_DJANGO=0.1.0
+GEMEINDESCAN_WEBUI_DJANGO=0.2.0
 DOCKER_DJANGO_NAME=$(shell basename $(shell dirname `pwd`))_django_1
 DOCKER_EXEC=$(shell command -v docker > /dev/null && echo "docker exec -it $(DOCKER_DJANGO_NAME)")
 

django/docker/django/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 MAINTAINER Yves Serrano <[email protected]>
 ARG S6_OVERLAY_VERSION=v1.22.1.0
 # https://github.com/just-containers/s6-overlay
@@ -11,6 +11,9 @@ RUN apk add --update \
         curl \
         libpq \
         python3 \
+        py3-pillow \
+        py3-gunicorn \
+        py3-psycopg2 \
         libressl \
         make \
         jq
@@ -33,7 +36,6 @@ RUN apk add \
         yaml-dev \
         g++ \
         gcc \
-        postgresql-dev \
         libressl-dev \
     && pip3 install -r /tmp/requirements.txt \
     && apk del \
@@ -47,7 +49,6 @@ RUN apk add \
         yaml-dev \
         g++ \
         gcc \
-        postgresql-dev \
         libressl-dev \
     && apk add libstdc++ \
     && rm -rf /var/cache/apk/* /tmp/*

django/docker/django/requirements.txt

@@ -1,27 +1,29 @@
 aniso8601==7.0.0
+appdirs==1.4.3
 asgiref==3.2.3
 astroid==2.3.3
 Click==7.0
-Django==3.0.2
+Django==3.0.3
 django-cors-headers==3.2.1
 django-filter==2.2.0
 docopt==0.6.2
 graphene==2.1.8
-graphene-django==2.8.0
+graphene-django==2.8.1
 graphql-core==2.2.1
 graphql-relay==2.0.1
-gunicorn==20.0.4
 h11==0.9.0
 httptools==0.0.13
 isort==4.3.21
 jedi==0.15.2
 lazy-object-proxy==1.4.3
 mccabe==0.6.1
+olefile==0.46
 parso==0.5.2
+Pillow==6.2.1
 promise==2.3
-prompt-toolkit==2.0.10
+prompt-toolkit==3.0.3
 psycopg2==2.8.4
-ptpython==2.0.6
+ptpython==3.0.0
 Pygments==2.5.2
 pylint==2.4.4
 pylint-django==2.0.13
@@ -30,9 +32,10 @@ pytz==2019.3
 Rx==1.6.1
 singledispatch==3.4.0.3
 six==1.13.0
+sorl-thumbnail==12.6.3
 sqlparse==0.3.0
 typed-ast==1.4.0
-uvicorn==0.11.1
+uvicorn==0.11.2
 uvloop==0.14.0
 wcwidth==0.1.8
 websockets==8.1

django/gsmap/admin.py

@@ -1,9 +1,27 @@
 from django.contrib import admin
-from gsmap.models import Municipality
+from django.utils.translation import gettext as _
+from gsmap.models import Municipality, Snapshot
 
 
 class MunicipalityAdmin(admin.ModelAdmin):
     pass
 
 
+class SnapshotAdmin(admin.ModelAdmin):
+    readonly_fields = (
+        'created',
+    )
+    fieldsets = (
+        (_('Meta'), {
+            'fields': ('created', 'id', 'archived', 'deleted')
+        }),
+        (_('Main'), {
+            'fields':
+            ('data', 'screenshot', 'municipality', 'predecessor', 'user'),
+        }),
+    )
+    list_display = ('id', 'created')
+
+
 admin.site.register(Municipality, MunicipalityAdmin)
+admin.site.register(Snapshot, SnapshotAdmin)

django/gsmap/migrations/0003_snapshot.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.0.3 on 2020-02-13 17:30
+
+from django.conf import settings
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+import sorl.thumbnail.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('gsmap', '0002_auto_20200130_1554'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Snapshot',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('slug_hash', models.CharField(max_length=8, unique=True)),
+                ('data', django.contrib.postgres.fields.jsonb.JSONField()),
+                ('screenshot', sorl.thumbnail.fields.ImageField(upload_to='snapshot-screenshots')),
+                ('archived', models.BooleanField(default=False)),
+                ('deleted', models.BooleanField(default=False)),
+                ('predecessor', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='gsmap.Snapshot')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

django/gsmap/migrations/0004_auto_20200213_2341.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.3 on 2020-02-13 23:41
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import gsmap.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0003_snapshot'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='snapshot',
+            name='data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='snapshot',
+            name='slug_hash',
+            field=models.CharField(default=gsmap.models.create_slug_hash, max_length=8, unique=True),
+        ),
+    ]

django/gsmap/migrations/0005_auto_20200218_1558.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.0.3 on 2020-02-18 15:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0004_auto_20200213_2341'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='snapshot',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='snapshot',
+            name='municipality',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='gsmap.Municipality'),
+        ),
+    ]