Merge pull request #590 from mapswipe/dev

merge togglecorp work into master

Author: Hagellach37

.github/workflows/actions.yml

@@ -24,24 +24,25 @@ jobs:
     - name: Code style
       working-directory: ./mapswipe_workers
       run: |
-        black --check mapswipe_workers
-        flake8 --count --config setup.cfg mapswipe_workers/
-        isort --check --settings-file setup.cfg mapswipe_workers/
+        black --check mapswipe_workers ../django
+        flake8 --count --config setup.cfg mapswipe_workers/ ../django/
+        isort --check --settings-file setup.cfg mapswipe_workers/ ../django/
     - name:  Setup Postgres Database Container
       env:
-        POSTGRES_PASSWORD: test
-        POSTGRES_USER: test
-        POSTGRES_DB: test
+        POSTGRES_PASSWORD: postgres
+        POSTGRES_USER: postgres
+        POSTGRES_DB: postgres
       run: |
         # Create a mock file for wal-g setup
         touch postgres/serviceAccountKey.json
         docker-compose up --build --detach postgres
+        for i in {1..5}; do docker-compose exec -T postgres pg_isready && s=0 && break || s=$? && sleep 5; done; (docker-compose logs postgres && exit $s)
     - name: Deploy Firebase Rules and Functions
       env:
         FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
         FIREBASE_DB: ${{ secrets.FIREBASE_DB }}
       run: |
-        docker-compose run firebase_deploy sh -c "firebase use $FIREBASE_DB && firebase deploy --token $FIREBASE_TOKEN --only database:rules"
+        docker-compose run --rm firebase_deploy sh -c "firebase use $FIREBASE_DB && firebase deploy --token $FIREBASE_TOKEN --only database"
     - name: Decrypt Service Account Key File
       working-directory: ./
       run: |
@@ -55,10 +56,12 @@ jobs:
       env:
         FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
         FIREBASE_DB: ${{ secrets.FIREBASE_DB }}
-        POSTGRES_PASSWORD: test
-        POSTGRES_USER: test
-        POSTGRES_DB: test
+        POSTGRES_PASSWORD: postgres
+        POSTGRES_USER: postgres
+        POSTGRES_DB: postgres
         OSMCHA_API_KEY: ${{ secrets.OSMCHA_API_KEY }}
+        DJANGO_SECRET_KEY: test-django-secret-key
       run: |
-        docker-compose run mapswipe_workers_creation python -m unittest discover --verbose --start-directory tests/unittests/
-        docker-compose run mapswipe_workers_creation python -m unittest discover --verbose --start-directory tests/integration/
+        docker-compose run --rm mapswipe_workers_creation python -m unittest discover --verbose --start-directory tests/unittests/
+        docker-compose run --rm mapswipe_workers_creation bash -c 'pip install pytest && pytest -ra -v --durations=10 tests/integration/'
+        docker-compose run --rm django pytest -ra -v --durations=10

.gitignore

@@ -57,6 +57,7 @@ coverage.xml
 # Django stuff:
 *.log
 local_settings.py
+django/assets  # Static/media files
 
 # Flask stuff:
 instance/
@@ -117,7 +118,10 @@ ENV/
 # don´t upload data dir
 data/
 mapswipe-data/
+django-data/
 postgres-data/
+pgdata_restored/
+django/db.sqlite3
 
 # don't upload app config for project managers dashboard
 app.js

Makefile

@@ -24,4 +24,4 @@ update_firebase_functions_and_db_rules:
 	docker compose run --rm firebase_deploy
 
 deploy_latest_workers_version:
-	git pull; docker compose build postgres manager_dashboard nginx api mapswipe_workers_creation mapswipe_workers_stats mapswipe_workers_firebase_to_postgres firebase_deploy; docker compose up -d postgres manager_dashboard nginx api mapswipe_workers_creation mapswipe_workers_stats mapswipe_workers_firebase_to_postgres firebase_deploy
+	git pull; docker compose build postgres django django-schedule-task manager_dashboard community_dashboard nginx api mapswipe_workers_creation mapswipe_workers_stats mapswipe_workers_firebase_to_postgres firebase_deploy; docker compose up -d postgres django django-schedule-task manager_dashboard community_dashboard nginx api mapswipe_workers_creation mapswipe_workers_stats mapswipe_workers_firebase_to_postgres firebase_deploy

community-dashboard/.babelrc

@@ -0,0 +1,46 @@
+{
+    "presets": [
+        "@babel/preset-env",
+        "@babel/preset-react",
+        "@babel/preset-typescript",
+    ],
+    "plugins": [
+        // Reuse babel's injected headers
+        "@babel/plugin-transform-runtime",
+
+        // Handle absolute imports
+        ["babel-plugin-module-resolver", {
+            "root": ["."],
+            "extensions": [".js", ".jsx", ".ts", ".tsx"],
+            "alias": {
+                "#generated": "./generated",
+                "#components": "./app/components",
+                "#views": "./app/views",
+                "#resources": "./app/resources",
+                "#base": "./app/Base",
+                "#utils": ["./app/Base/utils"],
+                "#hooks": './app/hooks',
+            },
+        }],
+
+        // Extends javascript support
+        "@babel/plugin-syntax-dynamic-import",
+        "@babel/plugin-proposal-do-expressions",
+
+        // Extends react support
+        "@babel/plugin-transform-react-constant-elements",
+        // "@babel/plugin-transform-react-inline-elements",
+
+        // Extends graphql support
+        'babel-plugin-graphql-tag',
+
+        // NOTE: we may not need to install these as well
+        // Polyfill
+        ["polyfill-corejs3", {
+            "method": "usage-global",
+        }],
+        ["polyfill-regenerator", {
+            "method": "usage-global",
+        }],
+    ],
+}

community-dashboard/.dockerignore

@@ -0,0 +1,145 @@
+media
+postgres-data
+redis-data
+
+production.env
+
+# Swap files
+*.swp
+
+# Byte-compiled / optimized / DLL files
+__pycache__
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env
+build
+develop-eggs
+dist
+downloads
+eggs
+.eggs
+lib
+lib64
+parts
+sdist
+var
+*.egg-info
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov
+.tox
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build
+
+# PyBuilder
+target
+
+#Ipython Notebook
+.ipynb_checkpoints
+
+# SASS cache
+.sass-cache
+media_test
+
+# Rope project settings
+.ropeproject
+
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Typescript v1 declaration files
+typings
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env*
+
+# Sensitive Deploy Files
+deploy/eb/
+
+# tox
+./.tox

community-dashboard/.env.example

@@ -0,0 +1,6 @@
+REACT_APP_SENTRY_DSN=
+REACT_APP_SENTRY_TRACES_SAMPLE_RATE=
+REACT_APP_ENVIRONMENT=
+
+GRAPHQL_CODEGEN_ENDPOINT=
+REACT_APP_GRAPHQL_ENDPOINT=

community-dashboard/.eslintignore

@@ -0,0 +1,8 @@
+node_modules
+build
+generated
+.*
+*.test.js
+*.test.ts
+*.test.jsx
+*.test.tsx