Merge latest changes from fair

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,17 +1,17 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
+title: ""
 labels: bug
-assignees: ''
-
+assignees: ""
 ---
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
+title: ""
 labels: enhancement
-assignees: ''
-
+assignees: ""
 ---
 
 **Is your feature request related to a problem? Please describe.**

.github/workflows/backend_build_check.yml

@@ -2,11 +2,11 @@ name: Build Docker Images
 on:
   pull_request:
     branches:
-      - master
+      - main
       - develop
     paths:
       - "backend/**"
-      - ".github/workflows/docker_build.yml"
+      - ".github/workflows/backend_build_check.yml"
 
 jobs:
   # Backend API image. amd64-only (GDAL + source-built tippecanoe make arm64

.github/workflows/deploy_frontend_s3.yml

@@ -5,8 +5,8 @@ on:
     branches:
       - develop
     paths:
-      - 'frontend/**'
-      - '.github/workflows/deploy_frontend_s3.yml'
+      - "frontend/**"
+      - ".github/workflows/deploy_frontend_s3.yml"
   workflow_dispatch:
 
 permissions:
@@ -79,4 +79,4 @@ jobs:
           DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Aliases.Items && contains(Aliases.Items, 'fair.hotosm.org')].Id | [0]" --output text)
           if [ "$DISTRIBUTION_ID" != "None" ] && [ -n "$DISTRIBUTION_ID" ]; then
             aws cloudfront create-invalidation --distribution-id "$DISTRIBUTION_ID" --paths "/*"
-          fi
+          fi

.github/workflows/frontend_build_check.yml

@@ -2,15 +2,15 @@ name: Frontend Build
 
 on:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths:
       - "frontend/**"
-      - ".github/workflows/frontend_build.yml"
+      - ".github/workflows/frontend_build_check.yml"
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths:
       - "frontend/**"
-      - ".github/workflows/frontend_build.yml"
+      - ".github/workflows/frontend_build_check.yml"
 
 jobs:
   frontend-unit-test:
@@ -55,7 +55,7 @@ jobs:
         run: pnpm run build
 
   # Build-only checks for PRs. Push happens in docker_publish_image.yml on
-  # merge to master/stage/develop.
+  # merge to main/stage/develop.
   docker-build-dev:
     needs: [frontend-unit-test]
     uses: hotosm/gh-workflows/.github/workflows/image_build.yml@4.0.3

.github/workflows/publish_container_image.yml

@@ -3,13 +3,12 @@ name: Build and Publish Docker Images
 on:
   push:
     branches:
-      - master
+      - main
       - stage
       - develop
     paths-ignore:
-      - ".github/workflows/backend_build.yml"
-      - ".github/workflows/frontend_build.yml"
-      - ".github/workflows/frontend_build_push.yml"
+      - ".github/workflows/backend_build_check.yml"
+      - ".github/workflows/frontend_build_check.yml"
   release:
     types: [released]
   workflow_dispatch:

.github/workflows/test_backend_build.yml

@@ -3,15 +3,15 @@ name: Backend lint and tests
 on:
   push:
     branches:
-      - master
+      - main
       - develop
     paths:
       - "backend/**"
       - ".github/workflows/test_backend_build.yml"
       - ".pre-commit-config.yaml"
   pull_request:
     branches:
-      - master
+      - main
       - develop
     paths:
       - "backend/**"
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b  # v8.1.0
+      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           enable-cache: true
           cache-dependency-glob: "backend/uv.lock"
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b  # v8.1.0
+      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           enable-cache: true
           cache-dependency-glob: "backend/uv.lock"

.gitignore

@@ -69,4 +69,5 @@ fair-app-data/*
 
 
 # helm charts
-fair-*.tgz
+fair-*.tgz
+.claude/

.pre-commit-config.yaml

@@ -29,6 +29,19 @@ repos:
         files: ^backend/(pyproject\.toml|uv\.lock)$
         pass_filenames: false
 
+  # Autoformat: YAML, JSON, Markdown, etc.
+  - repo: local
+    hooks:
+      - id: oxfmt
+        name: oxfmt
+        files: ^
+        # oxfmt batches it's runs, so using !/path/to/file in args can cause issues
+        exclude: ^(?:CHANGELOG\.md|frontend/pnpm-lock\.yaml|chart)
+        entry: oxfmt --no-error-on-unmatched-pattern --write
+        language: node
+        "types": [text]
+        additional_dependencies: ["oxfmt@0.35.0"]
+
       - id: pytest
         name: pytest (backend)
         entry: uv run --directory backend pytest

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Before you start contributing code, set up your local development environment:
 2. **Set up Docker environment** (recommended):
 
    ```bash
-   docker compose up  
+   docker compose up
    cp backend/.env.example backend/.env
    docker compose up api worker
    ```
@@ -57,5 +57,5 @@ Create pull requests (PRs) for changes that you think are needed to the document
 
 ## :handshake: Thank you
 
-Thank you very much in advance for your contributions!! Please ensure you refer to our [Code of Conduct](https://github.com/hotosm/fAIr/blob/master/docs/Code-of-Conduct.md).
+Thank you very much in advance for your contributions!! Please ensure you refer to our [Code of Conduct](https://github.com/hotosm/fAIr/blob/main/docs/Code-of-Conduct.md).
 If you've read the guidelines, but you are still not sure how to contribute on Github, please reach out to us via our Slack #geospatial-tech-and-innovation.

Readme.md → README.md

@@ -17,13 +17,13 @@
 <!-- prettier-ignore-start -->
 <div align="center">
 
-| **CI/CD** | | [![Backend Build](https://github.com/hotosm/fair/actions/workflows/backend_build.yml/badge.svg?branch=master)](https://github.com/hotosm/fair/actions/workflows/backend_build.yml) [![Frontend Build](https://github.com/hotosm/fair/actions/workflows/frontend_build.yml/badge.svg?branch=master)](https://github.com/hotosm/fair/actions/workflows/frontend_build.yml) |
+| **CI/CD** | | [![Backend Build](https://github.com/hotosm/fAIr/actions/workflows/test_backend_build.yml/badge.svg?branch=develop)](https://github.com/hotosm/fAIr/actions/workflows/test_backend_build.yml) [![Frontend Build](https://github.com/hotosm/fAIr/actions/workflows/frontend_build_check.yml/badge.svg?branch=develop)](https://github.com/hotosm/fAIr/actions/workflows/frontend_build_check.yml) |
 | :--- | :--- | :--- |
 | **Tech Stack** | | ![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django) ![React](https://img.shields.io/badge/React-20232A.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB) ![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white) ![PostgreSQL](https://img.shields.io/badge/PostgreSQL-316192.svg?style=for-the-badge&logo=postgresql&logoColor=white) ![TensorFlow](https://img.shields.io/badge/TensorFlow-FF6F00.svg?style=for-the-badge&logo=TensorFlow&logoColor=white) ![PyTorch](https://img.shields.io/badge/PyTorch-EE4C2C.svg?style=for-the-badge&logo=PyTorch&logoColor=white) |
 | **Code Style** | | [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://pre-commit.com) [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) |
 | **Community** | | [![Slack](https://img.shields.io/badge/Slack-Join%20the%20community!-d63f3f?style=for-the-badge&logo=slack&logoColor=white)](https://slack.hotosm.org) [![All Contributors](https://img.shields.io/badge/all-contributors-red.svg?logo=github)](https://github.com/hotosm/fAIr/graphs/contributors) |
 | **Submodules** | | [![fairpredictor Repo](https://img.shields.io/badge/fairpredictor-GitHub-blue.svg?logo=github)](https://github.com/hotosm/fairpredictor) [![fair-utilities Repo](https://img.shields.io/badge/fair--utilities-GitHub-green.svg?logo=github)](https://github.com/hotosm/fair-utilities) |
-| **Other Info** | | [![Roadmap](https://img.shields.io/badge/Roadmap-View%20Plan-blue.svg)](https://github.com/orgs/hotosm/projects/40) [![Figma Design](https://img.shields.io/badge/Figma-View%20Plan-red.svg)](https://www.figma.com/design/1WXme5jfWV4tCaY9Rcaekk/fAIr-Project---UIUX-Team?node-id=2772-7466&p=f) [![Features Plan](https://img.shields.io/badge/Features-Plan-orange.svg)](https://docs.google.com/document/d/1A8kRG-Tw922bV8CTz4HXjCpp7cZmHSpehLOQQF1EXao/edit?usp=sharing) [![License](https://img.shields.io/github/license/hotosm/fair.svg)](https://github.com/hotosm/fair/blob/main/LICENSE.md) |
+| **Other Info** | | [![Roadmap](https://img.shields.io/badge/Roadmap-View%20Plan-blue.svg)](https://github.com/orgs/hotosm/projects/40) [![Figma Design](https://img.shields.io/badge/Figma-View%20Plan-red.svg)](https://www.figma.com/design/1WXme5jfWV4tCaY9Rcaekk/fAIr-Project---UIUX-Team?node-id=2772-7466&p=f) [![Features Plan](https://img.shields.io/badge/Features-Plan-orange.svg)](https://docs.google.com/document/d/1A8kRG-Tw922bV8CTz4HXjCpp7cZmHSpehLOQQF1EXao/edit?usp=sharing) [![License](https://img.shields.io/github/license/hotosm/fair.svg)](https://github.com/hotosm/fair/blob/develop/LICENSE) |
 
 </div>
 
@@ -118,7 +118,7 @@ Checkout Docker Installation [docs](./docs/Docker-installation.md)
 
 ## Get involved!
 
-- Start by reading our [Code of conduct](https://github.com/hotosm/fAIr/blob/master/docs/Code-of-Conduct.md)
+- Start by reading our [Code of conduct](docs/Code-of-Conduct.md)
 - Get familiar with our [contributor guidelines](CONTRIBUTING.md) explaining the different ways in which you can support this project! We need your help!
 
 # Licenses