Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed May 13, 2024
1 parent b3593e0 commit c4c7450
Show file tree
Hide file tree
Showing 12 changed files with 18,880 additions and 1,676 deletions.
14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
- add community_type for organisations, add unapproved org list endpoint (#1197)
- osm-rawdata for generating data extracts (#1183)
- create / edit organization form (#1178)
- **frontend**: default organisation credentials during proj create (#1174)
- **frontend**: default organisation credentials during proj create (#1174)
- task history end point with associated user (#1071)
- manage / edit project UI (#1154)
- mapper role (#1163)
Expand Down Expand Up @@ -352,7 +352,7 @@
- added alchemy text on centroid api
- map Component added to main
- add script to generate openapi.json
- Added a new function to perform the conversion of task_boundary from GeoJSON to .osm format.
- Added a new function to perform the conversion of task_boundary from GeoJSON to .osm format.
- download button for data extract on project details fix Add option to download the data extract fix #779
- api for download data extract
- added download data extract loading
Expand All @@ -361,7 +361,7 @@
- use loguru stdout + json file logging
- form validation added on custom form
- added organisation_id on create project frontend
- organisation Id on create project api
- organisation Id on create project api
- added api to centroid logo
- added projectId on projectbyid
- Tailwindcss integrated
Expand Down Expand Up @@ -551,7 +551,7 @@
- minimum 5 of splitting algorithm
- Project name should accept other characters too. #754
- organization_id none case handled
- task splitted is not shown in map, although the number of tasks are determined and generated #750
- task splitted is not shown in map, although the number of tasks are determined and generated #750
- previous button wrong route issue
- project_id added in the tile_instance
- set tile_path_instance outside try, ref before assign
Expand Down Expand Up @@ -592,7 +592,7 @@
- pwa fixes for icon
- merge conflicts
- data Cleaning fix
- removed api listing static content
- removed api listing static content
- projects can be filter based on user_id and hashtags present in the project
- filtering by hashtags check if project hashtags overlap with requested hashtags
- task spliting for geojson with polygons instead of features
Expand Down Expand Up @@ -653,7 +653,7 @@
- osm-fieldwork import
- osm-fieldwork imports
- Fixes Create Project Section : The input file name has design issues. #452
- Create Project Section - Upload Area subsection : Alignment of the map elements need to be maintained. #451
- Create Project Section - Upload Area subsection : Alignment of the map elements need to be maintained. #451
- handle click outside issue
- organization post
- adjusted map page of home
Expand Down Expand Up @@ -766,7 +766,7 @@
- move app backend server files to app dir
- move backend code out of app dir for rebase
- add additional logging to odkcentral connection
- update __version__.py path in pyproject.toml
- update **version**.py path in pyproject.toml
- remove FMTM_TEST_DB_NAME, DB_URL --> FMTM_DB_URL
- ignore osm-fieldwork local dir
- remove tests dir in root (under src dirs)
Expand Down
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ description: Field Mapping Tasking Manager - coordinated field mapping.
version: "0.1.0"
appVersion: "2024.2.0"
maintainers:
- email: sam.woodcock@hotosm.org
name: Sam Woodcock
- email: sam.woodcock@hotosm.org
name: Sam Woodcock
home: https://github.com/hotosm/fmtm/tree/main/chart
icon: https://fmtm.hotosm.org/favicon.ico
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Requires secrets to be pre-populated inside the correct namespace:

```bash
kubectl create namespace fmtm
kubectl
kubectl
```

- **db-fmtm-vars** for postgres database
Expand Down
12 changes: 5 additions & 7 deletions chart/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "fmtm.fullname" . }}
labels:
{{- include "fmtm.labels" . | nindent 4 }}
name: { { include "fmtm.fullname" . } }
labels: { { - include "fmtm.labels" . | nindent 4 } }
spec:
type: {{ .Values.backend.service.type }}
type: { { .Values.backend.service.type } }
ports:
- port: {{ .Values.backend.service.port }}
- port: { { .Values.backend.service.port } }
targetPort: http
protocol: TCP
name: http
selector:
{{- include "fmtm.selectorLabels" . | nindent 4 }}
selector: { { - include "fmtm.selectorLabels" . | nindent 4 } }
6 changes: 4 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ backend:
# hosts:
# - chart-example.local

resources: {}
resources:
{}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
Expand Down Expand Up @@ -159,7 +160,8 @@ serviceAccount:
podAnnotations: {}
podLabels: {}

podSecurityContext: {}
podSecurityContext:
{}
# fsGroup: 2000

securityContext:
Expand Down
1 change: 1 addition & 0 deletions src/backend/app/auth/auth_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#

"""Auth routes, to login, logout, and get user details."""

from datetime import datetime, timezone
from typing import Optional

Expand Down
1 change: 0 additions & 1 deletion src/backend/app/users/user_crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#
"""Logic for user routes."""


from sqlalchemy.orm import Session

from app.db import db_models
Expand Down
1 change: 0 additions & 1 deletion src/backend/app/users/user_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

"""User dependencies for use in Depends."""


from typing import Union

from fastapi import Depends
Expand Down
16,124 changes: 16,123 additions & 1 deletion src/backend/tests/test_data/data_extract_kathmandu.geojson

Large diffs are not rendered by default.

Loading

0 comments on commit c4c7450

Please sign in to comment.