Merge branch 'main' into whatsapp-integration

.dockerignore

@@ -0,0 +1,82 @@
+# Cache files
+**/*.egg-info
+**/*.pyc
+.coverage
+.mypy_cache
+.pytest_cache
+.ropeproject
+**/.sass-cache
+**/.webassets-cache
+**/__pycache__
+.webpack_cache
+.cache
+
+# MacOS file
+**/.DS_Store
+
+# Assets and static files
+funnel/static/build
+funnel/static/service-worker.js
+funnel/static/service-worker.js.map
+funnel/static/img/fa5-packed.svg
+**/node_modules
+**/*.packed.css
+**/*.packed.js
+**/baseframe-packed.*
+
+# Download files
+geoname_data/
+download/
+
+# Dependencies
+build/dependencies
+
+# Log and test files
+error.log
+error.log.*
+ghostdriver.log
+geckodriver.log
+tests/cypress/screenshots
+tests/cypress/videos
+tests/screenshots
+tests/unit/utils/markdown/data/output.html
+coverage/
+
+# Instance files that should not be checked-in
+instance/development.py
+instance/hasgeekapp.py
+instance/production.py
+instance/settings.py
+instance/container_env
+
+# Forbidden secrets
+secrets.dev
+secrets.test
+newrelic.ini
+.env
+.env.*
+
+# Local venvs (Idea creates them)
+venv/
+env/
+.python-version
+
+# Editors
+.idea/
+.vscode/
+.project
+.pydevproject
+.settings
+*.wpr
+.vscode
+*.sublime-workspace
+
+# Versioning files
+.git
+
+# Local DBs
+dump.rdb
+test.db
+*.bz2
+*.gz
+*.sql

.flaskenv

@@ -0,0 +1,6 @@
+# The settings in this file are secondary to .env, which overrides
+
+# Assume production by default, unset debug and testing state
+FLASK_DEBUG=false
+FLASK_DEBUG_TB_ENABLED=false
+FLASK_TESTING=false

.gitattributes

@@ -1,7 +1,42 @@
 * text=auto eol=lf
 
-*.py text eol=lf
+*.gif binary
+*.ico binary
+*.jpg binary
+*.mo binary
+*.png binary
+*.webp binary
+
+.coveragerc text eol=lf
+.dockerignore text eol=lf
+.flaskenv text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+Dockerfile text eol=lf
+HOSTALIASES text eol=lf
+Makefile text eol=lf
+*.cfg text eol=lf
+*.css text eol=lf
+*.Dockerfile text eol=lf
+*.env text eol=lf
+*.feature text eol=lf
+*.html text eol=lf
+*.in text eol=lf
+*.ini text eol=lf
+*.jinja2 text eol=lf
 *.js text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+*.po text eol=lf
+*.pot text eol=lf
+*.py text eol=lf
+*.rb text eol=lf
+*.rst text eol=lf
+*.sample text eol=lf
 *.scss text eol=lf
-*.jinja2 text eol=lf
+*.sh text eol=lf
+*.svg text eol=lf
 *.toml text eol=lf
+*.txt text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf

.github/workflows/docker-ci-tests.yml

@@ -0,0 +1,71 @@
+name: 'Pytest on docker'
+
+on:
+  push:
+    branches: ['main']
+  pull_request:
+    branches: ['main']
+    paths:
+      - '**.py'
+      - '**.js'
+      - '**.scss'
+      - '**.jinja2'
+      - 'requirements/base.txt'
+      - 'requirements/test.txt'
+      - '.github/workflows/docker-ci-tests.yml'
+      - 'Dockerfile'
+      - 'pyproject.toml'
+      - '.eslintrc.js'
+      - 'docker-compose.yml'
+      - 'docker/compose/services.yml'
+      - 'docker/entrypoints/ci-test.sh'
+      - 'docker/initdb/test.sh'
+      - 'package.json'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Cache npm
+        uses: actions/cache@v3
+        with:
+          path: .cache/.npm
+          key: docker-npm
+      - name: Cache node_modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: docker-node_modules-${{ hashFiles('package-lock.json') }}
+      - name: Cache pip
+        uses: actions/cache@v3
+        with:
+          path: .cache/pip
+          key: docker-pip
+      - name: Cache .local
+        uses: actions/cache@v3
+        with:
+          path: .cache/.local
+          key: docker-user-local
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build funnel-test image
+        id: build-funnel-test
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ci.Dockerfile
+          tags: funnel-test:latest
+          load: true
+          push: false
+      - name: Run Tests
+        run: make docker-ci-test
+      - name: Upload coverage report to Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          path-to-lcov: coverage/funnel.lcov
+          flag-name: docker-3.11

.github/workflows/mypy-ratchet.yml

@@ -0,0 +1,30 @@
+name: Mypy Ratchet
+
+on:
+  push:
+    paths:
+      - '**.py'
+      - 'requirements/*.txt'
+      - '.github/workflows/mypy-ratchet.yml'
+
+jobs:
+  mypy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: pip
+          cache-dependency-path: 'requirements/*.txt'
+
+      - name: Install Python dependencies
+        run: |
+          make install-python-dev
+
+      - name: Run mypy
+        run: |
+          mypy . --strict --no-warn-unused-ignores | mypy-json-report parse --diff-old-report mypy-ratchet.json --output-file mypy-ratchet.json || true