Skip to content

Commit

Permalink
Merge branch 'main' into boreholes-table
Browse files Browse the repository at this point in the history
  • Loading branch information
MiraGeowerkstatt authored Aug 14, 2024
2 parents 55d62d4 + 2c96291 commit f36a8e6
Show file tree
Hide file tree
Showing 94 changed files with 1,296 additions and 1,121 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Tooltips to main side navigation.
- Location hash for tabs in borehole detail view.
- Language dropdown in the header.
- Added health check endpoint for the .NET API.

### Changed

Expand All @@ -24,6 +25,8 @@
- Removed unused `UserEvent` from user.
- Migrated `User` API endpoints to .NET API.
- Changed boreholes table design.
- Migrated `Workgroup` API endpoints to .NET API.
- Use `filled` style for form components.

### Fixed

Expand Down
8 changes: 4 additions & 4 deletions src/api-legacy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ COPY . ./bms

ARG VERSION
ARG REVISION
ENV APP_VERSION ${VERSION}
ENV APP_REVISION ${REVISION}
ENV APP_VERSION=${VERSION}
ENV APP_REVISION=${REVISION}

CMD python -u bms/main.py \
CMD ["/bin/sh", "-c", "python -u bms/main.py \
--pg-host=${DB_HOST} \
--pg-port=${DB_PORT} \
--pg-database=${DB_DATABASE} \
--pg-user=${DB_USERNAME} \
--pg-password=${DB_PASSWORD}
--pg-password=${DB_PASSWORD}"]
5 changes: 0 additions & 5 deletions src/api-legacy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,3 @@

# User actions
from bms.v1.user.handler import UserHandler

# Workgroup actions
from bms.v1.user.workgrpup.admin import WorkgroupAdminHandler
from bms.v1.user.workgrpup import ListWorkgroups
from bms.v1.user.workgrpup import CreateWorkgroup
3 changes: 0 additions & 3 deletions src/api-legacy/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ async def close(application):
# user handlers
SettingHandler,
UserHandler,
WorkgroupAdminHandler,

# Borehole handlers
BoreholeViewerHandler,
Expand Down Expand Up @@ -132,8 +131,6 @@ async def close(application):
# User handlers
(r'/api/v1/user', UserHandler),

(r'/api/v1/user/workgroup/edit', WorkgroupAdminHandler),

# Borehole handlers
(r'/api/v1/borehole', BoreholeViewerHandler),
(r'/api/v1/borehole/edit', BoreholeProducerHandler),
Expand Down
9 changes: 0 additions & 9 deletions src/api-legacy/v1/user/workgrpup/__init__.py

This file was deleted.

75 changes: 0 additions & 75 deletions src/api-legacy/v1/user/workgrpup/admin.py

This file was deleted.

42 changes: 0 additions & 42 deletions src/api-legacy/v1/user/workgrpup/create.py

This file was deleted.

36 changes: 0 additions & 36 deletions src/api-legacy/v1/user/workgrpup/delete.py

This file was deleted.

23 changes: 0 additions & 23 deletions src/api-legacy/v1/user/workgrpup/disable.py

This file was deleted.

23 changes: 0 additions & 23 deletions src/api-legacy/v1/user/workgrpup/enable.py

This file was deleted.

52 changes: 0 additions & 52 deletions src/api-legacy/v1/user/workgrpup/list.py

This file was deleted.

58 changes: 0 additions & 58 deletions src/api-legacy/v1/user/workgrpup/role.py

This file was deleted.

Loading

0 comments on commit f36a8e6

Please sign in to comment.