Merge the changes from develop (#276)

- change main to be the default branch

.env.example

@@ -1,8 +1,20 @@
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=secret
-POSTGRES_DB=civil_society_vote
-
-DATABASE_URL=postgres://postgres:secret@db/civil_society_vote
+DATABASE_USER=postgres
+DATABASE_PASSWORD=secret
+DATABASE_NAME=civil_society_vote
+DATABASE_HOST=db
+DATABASE_PORT=5432
 
 ENABLE_DEBUG_TOOLBAR=True
-LOAD_DUMMY_DATA=yes
+RUN_LOAD_DUMMY_DATA=True
+
+NO_REPLY_EMAIL=
+DEFAULT_FROM_EMAIL=
+DEFAULT_RECEIVE_EMAIL=
+
+EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend
+EMAIL_HOST=
+EMAIL_PORT=25
+EMAIL_HOST_USER=
+EMAIL_HOST_PASSWORD=
+EMAIL_USE_TLS=False
+EMAIL_USE_SSL=False

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 # the repo. Unless a later match takes precedence,
 # they will be requested for review when someone 
 # opens a pull request.
-*       @catileptic @aramboi
+
 
 # More details on creating a codeowners file:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners

.github/workflows/backend_check.yml

@@ -0,0 +1,96 @@
+name: Backend Check
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'Dockerfile*'
+      - 'docker-compose*.yml'
+  pull_request:
+    branches:
+      - 'main'
+    paths:
+      - 'backend/**.py'
+      - 'backend/requirements*.*'
+      - 'backend/pyproject.toml'
+      - 'Dockerfile*'
+      - 'docker-compose*.yml'
+      - '.github/workflows/backend_check.yml'
+      - 'data/**.csv'
+      - 'data/**.xlsx'
+
+jobs:
+  static_analysis:
+    name: Run static analysis
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out Git repository
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.11
+        cache: 'pip'
+
+    - name: Cache pip
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install Black & Ruff with latest pip
+      run: |
+        python -m pip install --upgrade pip
+        cat ./backend/requirements-dev.txt | grep black== | cut -d' ' -f1 | xargs pip install
+        cat ./backend/requirements-dev.txt | grep ruff== | cut -d' ' -f1 | xargs pip install
+
+    - name: Lint files using Ruff
+      run: |
+        ruff check ./backend
+
+    - name: Check formatting with Black
+      run: |
+        black --check ./backend
+
+  tests:
+    name: Run backend tests
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out Git repository
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.11
+        cache: 'pip'
+
+    - name: Cache pip
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install dependencies
+      run: |
+        cd ./backend
+        python -m pip install --upgrade pip
+        pip install -r requirements-dev.txt
+
+    - name: Set up translations
+      run: |
+        sudo apt-get install gettext
+        ./backend/manage.py compilemessages
+
+    - name: Run tests
+      env:
+        DJANGO_SETTINGS_MODULE: civil_society_vote.test_settings
+      run: |
+        cd ./backend
+        pytest -Wd --cov --cov-report=xml --cov-report=term-missing --cov-fail-under=60 -n auto

.github/workflows/build-image.yml

@@ -0,0 +1,23 @@
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+    paths:
+      - 'backend/**'
+      - 'docker/**'
+
+name: Build Docker image
+
+jobs:
+  build:
+    name: Build Docker image
+    uses: code4romania/.github/.github/workflows/build-push-image.yml@main
+    with:
+      image_name: vot-ong
+      region: eu-west-1
+      dockerfile: ./docker/dockerfiles/Dockerfile.backend
+    secrets:
+      username: ${{ secrets.DOCKER_HUB_USERNAME }}
+      token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

.gitignore

@@ -116,6 +116,7 @@ env.bak/
 venv.bak/
 
 # IDE
+*.iml
 .idea/
 .vscode/
 
@@ -143,7 +144,6 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
-# static files generated from Django application using `collectstatic`
-media
-mediafiles
-staticfiles
+# ignore the static files destination directory
+backend/static
+backend/media