Prod push

.editorconfig

@@ -0,0 +1,10 @@
+[*]
+indent_size = 4
+indent_style = space
+
+[Makefile]
+indent_size = 8
+indent_style = tab
+
+[{*js,*jsx,*ts,*tsx,*json,*prettierrc,*yml,*yaml}]
+indent_size = 2

.env.example.dev

@@ -0,0 +1,46 @@
+# api deployment
+ENVIRONMENT=development
+API_PORT=8030
+SECRET_KEY=test
+
+RUN_MIGRATION=True
+RUN_COMPILE_MESSAGES=True
+RUN_COLLECT_STATIC=False
+RUN_LOAD_INITIAL_DATA=False
+RUN_CREATE_SUPER_USER=True
+
+# django
+DEBUG=True
+ENABLE_DEBUG_TOOLBAR=True
+
+SITE_URL=
+EMAIL_HOST=
+EMAIL_PORT=25
+EMAIL_HOST_USER=
+EMAIL_HOST_PASSWORD=
+EMAIL_USE_TLS=no
+EMAIL_USE_SSL=no
+
+NO_REPLY_EMAIL=
+DEFAULT_FROM_EMAIL=
+
+# admin
+[email protected]
+DJANGO_ADMIN_PASSWORD=a
+
+# database
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=secret
+POSTGRES_DB=seismic_site
+POSTGRES_HOST=db
+POSTGRES_PORT=
+
+# client
+REACT_APP_DJANGO_SITE_URL=http://localhost
+REACT_APP_DJANGO_PORT=8030
+REACT_APP_DJANGO_API_ENDPOINT=api/v1
+
+# external api keys
+REACT_APP_CAPTCHA_API_KEY=
+HERE_MAPS_API_KEY=
+REACT_APP_HERE_MAPS_API_KEY=

.env.example.prod

@@ -0,0 +1,54 @@
+# api deployment
+ENVIRONMENT=production
+API_PORT=8030
+SECRET_KEY=test
+
+RUN_MIGRATION=True
+RUN_COMPILE_MESSAGES=True
+RUN_COLLECT_STATIC=True
+RUN_LOAD_INITIAL_DATA=False
+RUN_CREATE_SUPER_USER=True
+
+# django
+DEBUG=False
+ENABLE_DEBUG_TOOLBAR=False
+
+SITE_URL=
+EMAIL_HOST=
+EMAIL_PORT=25
+EMAIL_HOST_USER=
+EMAIL_HOST_PASSWORD=
+EMAIL_USE_TLS=False
+EMAIL_USE_SSL=False
+
+NO_REPLY_EMAIL=
+DEFAULT_FROM_EMAIL=
+
+ALLOWED_HOSTS=localhost
+CSRF_TRUSTED_ORIGINS=http://localhost
+CORS_ALLOWED_ORIGINS=http://localhost
+CORS_ALLOWED_ORIGIN_REGEXES=http://localhost*
+
+# admin
+[email protected]
+DJANGO_ADMIN_PASSWORD=a
+
+# database
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=secret
+POSTGRES_DB=seismic_site
+POSTGRES_HOST=db
+POSTGRES_PORT=
+
+BACKGROUND_WORKERS=2
+GUNICORN_WORKERS=2
+
+# client
+REACT_APP_DJANGO_SITE_URL=http://localhost
+REACT_APP_DJANGO_PORT=8030
+REACT_APP_DJANGO_API_ENDPOINT=api/v1
+
+# external api keys
+REACT_APP_CAPTCHA_API_KEY=
+HERE_MAPS_API_KEY=
+REACT_APP_HERE_MAPS_API_KEY=

.github/workflows/api_pipeline.yml

@@ -8,22 +8,22 @@ on:
     paths:
       - 'api/**.py'
       - 'api/requirements*.*'
-      - 'api/Dockerfile'
+      - 'docker/dockerfiles/Dockerfile.backend*'
       - 'docker-compose.yml'
       - '.github/workflows/api_pipeline.yml'
 
 jobs:
   static_analysis:
     name: Run black formatting check
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.11
 
     - name: Install Black with latest pip
       run: |
@@ -32,19 +32,19 @@ jobs:
 
     - name: Check formatting with black
       run: |
-        black --line-length 120 --target-version py37 --exclude migrations --check ./api
+        black --line-length 120 --target-version py311 --exclude migrations --check ./api
 
   tests:
     name: Run api tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.11
 
     - name: Install dependencies
       run: |
@@ -53,4 +53,4 @@ jobs:
 
     - name: Run tests
       run: |
-        cd ./api && pytest
+        ENVIRONMENT=test DJANGO_SETTINGS_MODULE=seismic_site.settings.test ./api/manage.py test

.github/workflows/build.yml

@@ -0,0 +1,35 @@
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+
+name: Build Docker image
+
+jobs:
+
+  build-backend-amd64:
+    name: backend/amd64
+    uses: code4romania/.github/.github/workflows/build-push-image.yml@main
+    with:
+      images: ghcr.io/code4romania/seismic-risc-backend
+      context: ./
+      dockerfile: ./docker/dockerfiles/Dockerfile.backend
+      registry: ghcr.io
+    secrets:
+      username: ${{ github.actor }}
+      token: ${{ secrets.GITHUB_TOKEN }}
+
+#  disable frontend build for now since we're using Vercel
+#  build-frontend-amd64:
+#    name: frontend/amd64
+#    uses: code4romania/.github/.github/workflows/build-push-image.yml@main
+#    with:
+#      images: ghcr.io/code4romania/seismic-risc-frontend
+#      context: ./client
+#      dockerfile: ./docker/dockerfiles/Dockerfile.frontend
+#      registry: ghcr.io
+#    secrets:
+#      username: ${{ github.actor }}
+#      token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/client_pipeline.yml

@@ -8,22 +8,22 @@ on:
     paths:
       - 'client/**.js'
       - 'client/package*.json'
-      - 'client/Dockerfile'
+      - 'docker/dockerfiles/Dockerfile.frontend*'
       - 'docker-compose.yml'
       - '.github/workflows/client_pipeline.yml'
 
 jobs:
   run-linters:
     name: Run linters
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
 
     - name: Install Node.js dependencies
       run: npm install
@@ -35,15 +35,15 @@ jobs:
 
   tests:
     name: Run client tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
 
     - name: Install Node.js dependencies
       run: npm install

.github/workflows/codeql-analysis-js.yml

@@ -8,7 +8,7 @@ on:
     paths:
       - 'client/**.js'
       - 'client/package*.json'
-      - 'client/Dockerfile'
+      - 'docker/dockerfiles/Dockerfile.frontend*'
       - 'docker-compose.yml'
       - '.github/workflows/client_pipeline.yml'
       - '.github/workflows/code-analysis-js.yml'
@@ -18,7 +18,7 @@ on:
 jobs:
   analyze_js:
     name: Analyze code
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -27,14 +27,14 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/codeql-analysis-py.yml

@@ -8,7 +8,7 @@ on:
     paths:
       - 'api/**.py'
       - 'api/requirements*.*'
-      - 'api/Dockerfile'
+      - 'docker/dockerfiles/Dockerfile.backend*'
       - 'docker-compose.yml'
       - '.github/workflows/api_pipeline.yml'
       - '.github/workflows/code-analysis-py.yml'
@@ -18,7 +18,7 @@ on:
 jobs:
   analyze_py:
     name: Analyze code
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -27,15 +27,14 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
-
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2