Skip to content

Commit

Permalink
chore: add program model and assorted cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Muchogoc committed Jan 10, 2023
1 parent 07d88c4 commit d84f3ac
Show file tree
Hide file tree
Showing 91 changed files with 5,412 additions and 9,437 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PYTHON_VERSION=3.9-slim-buster
ARG PYTHON_VERSION=3.10-slim-buster

FROM node:10-stretch-slim as client-builder
FROM node:18-stretch-slim as client-builder

ARG APP_HOME=/app
WORKDIR ${APP_HOME}
Expand Down
4 changes: 0 additions & 4 deletions config/api_router.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from django.conf import settings
from rest_framework.routers import DefaultRouter, SimpleRouter

from mycarehub.clients.views import CaregiverViewSet, ClientFacilityViewSet, ClientViewSet
from mycarehub.common.views import FacilityViewSet, UserFacilityViewSet
from mycarehub.content.views import (
ContentBookmarkViewSet,
Expand All @@ -20,9 +19,6 @@
router.register("users", UserViewSet)
router.register("facilities", FacilityViewSet)
router.register("user_facilities", UserFacilityViewSet)
router.register("clients", ClientViewSet)
router.register("client_facilities", ClientFacilityViewSet)
router.register("caregivers", CaregiverViewSet)
router.register("content_item_category", ContentItemCategoryViewSet)
router.register("content_view", ContentViewViewSet)
router.register("content_bookmark", ContentBookmarkViewSet)
Expand Down
8 changes: 3 additions & 5 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@
"mycarehub.content.apps.ContentConfig",
"mycarehub.clients.apps.ClientsConfig",
"mycarehub.staff.apps.StaffConfig",
"mycarehub.authority.apps.AuthorityConfig",
"mycarehub.communities.apps.CommunityConfig",
"mycarehub.screeningtools.apps.ScreeningtoolsConfig",
"mycarehub.appointments.apps.AppointmentsConfig",
"mycarehub.questionnaires.apps.QuestionnairesConfig",
]
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS

Expand Down Expand Up @@ -437,6 +432,9 @@
# used by the user model to assign a default organisation to a user during creation
DEFAULT_ORG_ID = env("DEFAULT_ORG_ID", default="4181df12-ca96-4f28-b78b-8e8ad88b25df")

# used by the user model to assign a default program to a user during creation
DEFAULT_PROGRAM_ID = env("DEFAULT_PROGRAM_ID", default="f9274d93-35c2-450a-ae56-00c75e1f8a43")

# BigAutoField needs migration of existing data and either changes to
# dependencies or overriding dependencies
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
Expand Down
42 changes: 20 additions & 22 deletions config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@
from wagtail.images.api.v2.views import ImagesAPIViewSet
from wagtail.images.views.serve import ServeView

from mycarehub.clients.views import ClientRegistrationView
from mycarehub.common.views import AboutView, HomeView
from mycarehub.content.views import CustomPageAPIViewset, SignedURLView
from mycarehub.staff.views import StaffRegistrationView

from .graphql_auth import DRFAuthenticatedGraphQLView

Expand All @@ -44,26 +42,26 @@
csrf_exempt(DRFAuthenticatedGraphQLView.as_view(graphiql=True)),
name="graphql",
),
path(
"client_remove/<pk>",
ClientRegistrationView.as_view(),
name="client_removal",
),
path(
"client_registration",
ClientRegistrationView.as_view(),
name="client_registration",
),
path(
"staff_remove/<pk>",
StaffRegistrationView.as_view(),
name="staff_removal",
),
path(
"staff_registration",
StaffRegistrationView.as_view(),
name="staff_registration",
),
# path(
# "client_remove/<pk>",
# ClientRegistrationView.as_view(),
# name="client_removal",
# ),
# path(
# "client_registration",
# ClientRegistrationView.as_view(),
# name="client_registration",
# ),
# path(
# "staff_remove/<pk>",
# StaffRegistrationView.as_view(),
# name="staff_removal",
# ),
# path(
# "staff_registration",
# StaffRegistrationView.as_view(),
# name="staff_registration",
# ),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
if settings.DEBUG:
# Static file serving when using Gunicorn + Uvicorn for local web socket development
Expand Down
38 changes: 0 additions & 38 deletions data/authority.json

This file was deleted.

235 changes: 0 additions & 235 deletions data/screeningtools.json

This file was deleted.

Empty file removed mycarehub/appointments/__init__.py
Empty file.
5 changes: 0 additions & 5 deletions mycarehub/appointments/apps.py

This file was deleted.

0 comments on commit d84f3ac

Please sign in to comment.