Merge pull request #43 from ccs-amsterdam/redesign

Redesign

.dmypy.json

@@ -0,0 +1 @@
+{"pid": 208431, "connection_name": "/tmp/tmpccrhv4cx/dmypy.sock"}

.env.example

@@ -19,7 +19,7 @@ amcat4_elastic_verify_ssl=False
 amcat4_auth=no_auth
 
 # Middlecat server to trust as ID provider
-amcat4_middlecat_url=https://middlecat.up.railway.app
+amcat4_middlecat_url=https://middlecat.net
 
 # Email address for a hardcoded admin email (useful for setup and recovery)
 #amcat4_admin_email=

.github/workflows/linting.yml

@@ -5,31 +5,30 @@ name: Flake8
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.9"]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        pip install -e .[dev]
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=env
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --max-line-length=127 --statistics --exclude=env
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -e .[dev]
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=env
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          flake8 . --count --max-line-length=127 --ignore=E203 --statistics --exclude=env

.gitignore

@@ -2,6 +2,7 @@
 
 # .env environment variables
 .env
+.venv
 
 # C extensions
 *.so
@@ -49,8 +50,10 @@ nosetests.xml
 # PyCharm meuk
 .idea
 
-# vscode meuk
-.vscode
+# vscode meuk (only include extensions and settings)
+.vscode/*
+!.vscode/settings.json
+!.vscode/extensions.json
 
 # static files
 navigator/media/static

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "matangover.mypy",
+    "ms-python.python",
+    "ms-python.black-formatter"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,14 @@
+{
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.formatOnSave": true
+  },
+
+  "black-formatter.args": ["--line-length", "127"],
+  "mypy.enabled": true,
+  "mypy.runUsingActiveInterpreter": true,
+  "python.analysis.typeCheckingMode": "basic",
+
+  "python.analysis.autoImportCompletions": true,
+  "flake8.args": ["--max-line-length=127", "--ignore=E203"]
+}