Merge branch 'development' of https://github.com/hotosm/fmtm into fea…

…t-mobile-ui-project-details
hotosm · Oct 12, 2023 · 3b4e700 · 3b4e700
2 parents d794343 + ff26553
commit 3b4e700
Show file tree

Hide file tree

Showing 72 changed files with 9,654 additions and 31,009 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -23,41 +23,83 @@
       "profile": "https://www.hotosm.org",
       "contributions": ["maintenance", "mentoring", "code", "review", "ideas"]
     },
+    {
+      "login": "spwoodcock",
+      "name": "Sam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/78538841?v=4",
+      "profile": "https://github.com/spwoodcock",
+      "contributions": ["code", "review", "infra", "ideas", "maintenance"]
+    },
+    {
+      "login": "varun2948",
+      "name": "Deepak Pradhan (Varun)",
+      "avatar_url": "https://avatars.githubusercontent.com/u/37866666?v=4",
+      "profile": "https://github.com/varun2948",
+      "contributions": ["code", "ideas", "maintenance"]
+    },
+    {
+      "login": "nrjadkry",
+      "name": "Niraj Adhikari",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41701707?v=4",
+      "profile": "https://github.com/nrjadkry",
+      "contributions": ["code", "ideas", "maintenance"]
+    },
     {
       "login": "krtonga",
       "name": "krtonga",
       "avatar_url": "https://avatars.githubusercontent.com/u/7307817?v=4",
       "profile": "https://github.com/krtonga",
       "contributions": ["code", "doc", "tool", "ideas"]
     },
-    {
-      "login": "spwoodcock",
-      "name": "Sam",
-      "avatar_url": "https://avatars.githubusercontent.com/u/78538841?v=4",
-      "profile": "https://github.com/spwoodcock",
-      "contributions": ["code", "review", "infra", "ideas"]
-    },
     {
       "login": "petya-kangalova",
       "name": "Petya ",
       "avatar_url": "https://avatars.githubusercontent.com/u/98902727?v=4",
       "profile": "https://www.hotosm.org/people/petya-kangalova/",
       "contributions": ["doc", "eventOrganizing", "ideas"]
     },
+    {
+      "login": "Sujanadh",
+      "name": "Sujan Adhikari",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109404840?v=4",
+      "profile": "https://github.com/Sujanadh",
+      "contributions": ["code"]
+    },
     {
       "login": "Mudi-business",
       "name": "Mohamed Bakari Mohamed",
       "avatar_url": "https://avatars.githubusercontent.com/u/52991565?v=4",
       "profile": "http://zanrevenue.org",
       "contributions": ["code"]
     },
+    {
+      "login": "NSUWAL123",
+      "name": "Nishit Suwal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/81785002?v=4",
+      "profile": "https://github.com/NSUWAL123",
+      "contributions": ["code"]
+    },
     {
       "login": "biomassives",
       "name": "G. Willson",
       "avatar_url": "https://avatars.githubusercontent.com/u/4379874?v=4",
       "profile": "https://www.scdhub.org",
       "contributions": ["code"]
     },
+    {
+      "login": "JoltCode",
+      "name": "JoltCode",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46378904?v=4",
+      "profile": "https://github.com/JoltCode",
+      "contributions": ["code"]
+    },
+    {
+      "login": "neelimagoogly",
+      "name": "Neelima Mohanty",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97789856?v=4",
+      "profile": "https://github.com/neelimagoogly",
+      "contributions": ["doc"]
+    },
     {
       "login": "Ndacyayisenga-droid",
       "name": "Tayebwa Noah",
@@ -92,15 +134,9 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/75838716?v=4",
       "profile": "https://github.com/Roseford",
       "contributions": ["doc"]
-    },
-    {
-      "login": "neelimagoogly",
-      "name": "Neelima Mohanty",
-      "avatar_url": "https://avatars.githubusercontent.com/u/97789856?v=4",
-      "profile": "https://github.com/neelimagoogly",
-      "contributions": ["doc"]
     }
   ],
   "contributorsPerLine": 7,
-  "linkToUsage": true
+  "linkToUsage": true,
+  "commitType": "docs"
 }
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,22 @@
+"frontend":
+  - "src/frontend/**/*"
+"backend":
+  - "src/backend/**/*"
+"devops":
+  - ".github/**/*"
+  - "scripts/**/*"
+  - "docker-*.yml"
+  - "**/Dockerfile"
+  - "**/*.dockerfile"
+  - "**/*entrypoint.sh"
+  - "josm/**/*"
+"migration":
+  - "src/backend/migrations/**/*"
+"documentation":
+  - "docs/**/*"
+  - "images/**/*"
+  - "mkdocs.yml"
+  - "README.md"
+  - "INSTALL.md"
+"ODK":
+  - "odkcentral/**/*"
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -54,8 +54,7 @@ jobs:
         "ghcr.io/hotosm/fmtm/frontend:latest"
       build_args: |
         APP_VERSION=${{ needs.extract-vars.outputs.frontend_main_version }}
-        API_URL=${{ needs.extract-vars.outputs.api_url }}
-        FRONTEND_MAIN_URL=${{ needs.extract-vars.outputs.frontend_main_url }}
+        VITE_API_URL=${{ needs.extract-vars.outputs.api_url }}
 
   smoke-test-backend:
     runs-on: ubuntu-latest
@@ -99,7 +98,6 @@ jobs:
           # docker run --rm -d \
           #   --network=fmtm \
           #   -p 8080:8080 \
-          #   -e FRONTEND_MAIN_URL="http://test.com" \
           #   -e OSM_CLIENT_ID="test" \
           #   -e OSM_CLIENT_SECRET="test" \
           #   -e OSM_SECRET_KEY="test" \

diff --git a/.github/workflows/pr_label.yml b/.github/workflows/pr_label.yml
@@ -0,0 +1,14 @@
+name: PR Label
+
+on:
+  pull_request:
+
+jobs:
+  pr-label:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/labeler@v3
+        # Uses .github/labeler.yml definitions
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr.yml → .github/workflows/pr_test.yml b/.github/workflows/pr.yml → .github/workflows/pr_test.yml
@@ -1,4 +1,4 @@
-name: PR
+name: PR Tests
 
 on:
   pull_request:

diff --git a/.github/workflows/r-extract_vars.yml b/.github/workflows/r-extract_vars.yml
@@ -18,9 +18,6 @@ on:
       api_url:
         description: "URL to access the backend API."
         value: ${{ jobs.extract-vars.outputs.api_url }}
-      frontend_main_url:
-        description: "URL to access the main frontend."
-        value: ${{ jobs.extract-vars.outputs.frontend_main_url }}
 
 jobs:
   extract-vars:
@@ -30,7 +27,6 @@ jobs:
       api_version: ${{ steps.extract_api_version.outputs.api_version }}
       frontend_main_version: ${{ steps.extract_frontend_version.outputs.frontend_main_version }}
       api_url: ${{ steps.get_env_vars.outputs.api_url }}
-      frontend_main_url: ${{ steps.get_env_vars.outputs.frontend_main_url }}
 
     steps:
       - name: Checkout repository
@@ -55,5 +51,3 @@ jobs:
         run: |
           echo "api_url: ${{ vars.URL_SCHEME }}://${{ vars.API_URL }}"
           echo "api_url=${{ vars.URL_SCHEME }}://${{ vars.API_URL }}" >> $GITHUB_OUTPUT
-          echo "frontend_main_url: ${{ vars.URL_SCHEME }}://${{ vars.FRONTEND_MAIN_URL }}"
-          echo "frontend_main_url=${{ vars.URL_SCHEME }}://${{ vars.FRONTEND_MAIN_URL }}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/r-frontend_tests.yml b/.github/workflows/r-frontend_tests.yml
@@ -12,22 +12,21 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: 18
+          cache: "pnpm"
+          cache-dependency-path: "src/frontend/pnpm-lock.yaml"
 
-      - name: Cache Node Modules
-        uses: actions/cache@v3
-        with:
-          path: |
-            src/frontend/node_modules
-          keys: node-modules-${{ env.cache_id }}
-          restore-keys: |
-            node-modules-
+      - name: Install dependencies
+        working-directory: src/frontend
+        run: pnpm install
 
       - name: Test Frontend
-        run: |
-          cd src/frontend
-          npm ci --only-dev
-          npm run test
+        working-directory: src/frontend
+        run: pnpm run test
diff --git a/Makefile b/Makefile
@@ -19,13 +19,14 @@
 # All python source files
 # MDS := $(wildcard ./docs/*.md)
 MDS := \
-	docs/DEV-1.-Getting-Started.md \
-	docs/DEV-2.-Backend.md \
-	docs/DEV-3.-Frontend.md \
-	docs/DEV-4.-Database-Tips.md \
-	docs/DEV-5.-Docker-Tips.md \
-	docs/DEV-6.-Production-Deployment.md \
-	docs/User-Manual-For-Project-Managers.md
+	docs/dev/Backend.md \
+	docs/dev/Database-Tips.md \
+	docs/dev/Deployment-Flow.md \
+	docs/dev/Docker-Tips.md \
+	docs/dev/Frontend.md \
+	docs/dev/Production.md \
+	docs/dev/Setup.md \
+	docs/dev/Troubleshooting.md \
 
 PDFS := $(MDS:.md=.pdf)
 

diff --git a/README.md b/README.md
@@ -261,24 +261,26 @@ Thanks goes to these wonderful people:
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://ivangayton.net"><img src="https://avatars.githubusercontent.com/u/5991943?v=4?s=100" width="100px;" alt="Ivan Gayton"/><br /><sub><b>Ivan Gayton</b></sub></a><br /><a href="#projectManagement-ivangayton" title="Project Management">📆</a> <a href="https://github.com/hotosm/fmtm/commits?author=ivangayton" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Aivangayton" title="Reviewed Pull Requests">👀</a> <a href="#ideas-ivangayton" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.hotosm.org"><img src="https://avatars.githubusercontent.com/u/71342768?v=4?s=100" width="100px;" alt="Rob Savoye"/><br /><sub><b>Rob Savoye</b></sub></a><br /><a href="#maintenance-robsavoye" title="Maintenance">🚧</a> <a href="#mentoring-robsavoye" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/hotosm/fmtm/commits?author=robsavoye" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Arobsavoye" title="Reviewed Pull Requests">👀</a> <a href="#ideas-robsavoye" title="Ideas, Planning, & Feedback">🤔</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/krtonga"><img src="https://avatars.githubusercontent.com/u/7307817?v=4?s=100" width="100px;" alt="krtonga"/><br /><sub><b>krtonga</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=krtonga" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/commits?author=krtonga" title="Documentation">📖</a> <a href="#tool-krtonga" title="Tools">🔧</a> <a href="#ideas-krtonga" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/spwoodcock"><img src="https://avatars.githubusercontent.com/u/78538841?v=4?s=100" width="100px;" alt="Sam"/><br /><sub><b>Sam</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=spwoodcock" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Aspwoodcock" title="Reviewed Pull Requests">👀</a> <a href="#infra-spwoodcock" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-spwoodcock" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-spwoodcock" title="Maintenance">🚧</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.hotosm.org/people/petya-kangalova/"><img src="https://avatars.githubusercontent.com/u/98902727?v=4?s=100" width="100px;" alt="Petya "/><br /><sub><b>Petya </b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=petya-kangalova" title="Documentation">📖</a> <a href="#eventOrganizing-petya-kangalova" title="Event Organizing">📋</a> <a href="#ideas-petya-kangalova" title="Ideas, Planning, & Feedback">🤔</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nrjadkry"><img src="https://avatars.githubusercontent.com/u/41701707?v=4?s=100" width="100px;" alt="Niraj Adhikari"/><br /><sub><b>Niraj Adhikari</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=nrjadkry" title="Code">💻</a> <a href="#ideas-nrjadkry" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-nrjadkry" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/varun2948"><img src="https://avatars.githubusercontent.com/u/37866666?v=4?s=100" width="100px;" alt="Deepak Pradhan (Varun)"/><br /><sub><b>Deepak Pradhan (Varun)</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=varun2948" title="Code">💻</a> <a href="#ideas-varun2948" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-varun2948" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nrjadkry"><img src="https://avatars.githubusercontent.com/u/41701707?v=4?s=100" width="100px;" alt="Niraj Adhikari"/><br /><sub><b>Niraj Adhikari</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=nrjadkry" title="Code">💻</a> <a href="#ideas-nrjadkry" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-nrjadkry" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/krtonga"><img src="https://avatars.githubusercontent.com/u/7307817?v=4?s=100" width="100px;" alt="krtonga"/><br /><sub><b>krtonga</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=krtonga" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/commits?author=krtonga" title="Documentation">📖</a> <a href="#tool-krtonga" title="Tools">🔧</a> <a href="#ideas-krtonga" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.hotosm.org/people/petya-kangalova/"><img src="https://avatars.githubusercontent.com/u/98902727?v=4?s=100" width="100px;" alt="Petya "/><br /><sub><b>Petya </b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=petya-kangalova" title="Documentation">📖</a> <a href="#eventOrganizing-petya-kangalova" title="Event Organizing">📋</a> <a href="#ideas-petya-kangalova" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://zanrevenue.org"><img src="https://avatars.githubusercontent.com/u/52991565?v=4?s=100" width="100px;" alt="Mohamed Bakari Mohamed"/><br /><sub><b>Mohamed Bakari Mohamed</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Mudi-business" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Sujanadh"><img src="https://avatars.githubusercontent.com/u/109404840?v=4?s=100" width="100px;" alt="Sujan Adhikari"/><br /><sub><b>Sujan Adhikari</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Sujanadh" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AugustHottie"><img src="https://avatars.githubusercontent.com/u/96122635?v=4?s=100" width="100px;" alt="AugustHottie"/><br /><sub><b>AugustHottie</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=AugustHottie" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Balofire"><img src="https://avatars.githubusercontent.com/u/102294666?v=4?s=100" width="100px;" alt="Ahmeed Etti-Balogun"/><br /><sub><b>Ahmeed Etti-Balogun</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Balofire" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Roseford"><img src="https://avatars.githubusercontent.com/u/75838716?v=4?s=100" width="100px;" alt="Uju"/><br /><sub><b>Uju</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Roseford" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/neelimagoogly"><img src="https://avatars.githubusercontent.com/u/97789856?v=4?s=100" width="100px;" alt="Neelima Mohanty"/><br /><sub><b>Neelima Mohanty</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=neelimagoogly" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://zanrevenue.org"><img src="https://avatars.githubusercontent.com/u/52991565?v=4?s=100" width="100px;" alt="Mohamed Bakari Mohamed"/><br /><sub><b>Mohamed Bakari Mohamed</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Mudi-business" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NSUWAL123"><img src="https://avatars.githubusercontent.com/u/81785002?v=4?s=100" width="100px;" alt="Nishit Suwal"/><br /><sub><b>Nishit Suwal</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=NSUWAL123" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.scdhub.org"><img src="https://avatars.githubusercontent.com/u/4379874?v=4?s=100" width="100px;" alt="G. Willson"/><br /><sub><b>G. Willson</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=biomassives" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JoltCode"><img src="https://avatars.githubusercontent.com/u/46378904?v=4?s=100" width="100px;" alt="JoltCode"/><br /><sub><b>JoltCode</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=JoltCode" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/neelimagoogly"><img src="https://avatars.githubusercontent.com/u/97789856?v=4?s=100" width="100px;" alt="Neelima Mohanty"/><br /><sub><b>Neelima Mohanty</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=neelimagoogly" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ndacyayisenga-droid"><img src="https://avatars.githubusercontent.com/u/58124613?v=4?s=100" width="100px;" alt="Tayebwa Noah"/><br /><sub><b>Tayebwa Noah</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Ndacyayisenga-droid" title="Documentation">📖</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ndacyayisenga-droid"><img src="https://avatars.githubusercontent.com/u/58124613?v=4?s=100" width="100px;" alt="Tayebwa Noah"/><br /><sub><b>Tayebwa Noah</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Ndacyayisenga-droid" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mohammadareeb95"><img src="https://avatars.githubusercontent.com/u/77102111?v=4?s=100" width="100px;" alt="Mohammad Areeb"/><br /><sub><b>Mohammad Areeb</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=mohammadareeb95" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AugustHottie"><img src="https://avatars.githubusercontent.com/u/96122635?v=4?s=100" width="100px;" alt="AugustHottie"/><br /><sub><b>AugustHottie</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=AugustHottie" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Balofire"><img src="https://avatars.githubusercontent.com/u/102294666?v=4?s=100" width="100px;" alt="Ahmeed Etti-Balogun"/><br /><sub><b>Ahmeed Etti-Balogun</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Balofire" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Roseford"><img src="https://avatars.githubusercontent.com/u/75838716?v=4?s=100" width="100px;" alt="Uju"/><br /><sub><b>Uju</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Roseford" title="Documentation">📖</a></td>
     </tr>
   </tbody>
   <tfoot>

diff --git a/docker-compose.deploy.yml b/docker-compose.deploy.yml
@@ -125,8 +125,7 @@ services:
       dockerfile: prod.dockerfile
       args:
         APP_VERSION: ${FRONTEND_MAIN_VERSION}
-        API_URL: ${URL_SCHEME}://${API_URL}
-        FRONTEND_MAIN_URL: ${URL_SCHEME}://${FRONTEND_MAIN_URL}
+        VITE_API_URL: ${URL_SCHEME}://${API_URL}
     container_name: fmtm
     depends_on:
       - api
@@ -135,8 +134,7 @@ services:
       - fmtm-net
     environment:
       - BROTLI=true
-      - API_URL=${URL_SCHEME}://${API_URL}
-      - FRONTEND_MAIN_URL=${URL_SCHEME}://${FRONTEND_MAIN_URL}
+      - VITE_API_URL=${URL_SCHEME}://${API_URL}
     restart: "unless-stopped"
     labels:
       - "traefik.enable=true"