Merge pull request #21 from CentreForDigitalHumanities/feature/problems-in-db

Feature/problems in db

Author: XanderVertegaal

backend/.gitignore

@@ -31,3 +31,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+
+# Data files
+problem/data/*

backend/example/apps.py

@@ -16,9 +16,8 @@
     # cf. https://github.com/iMerica/dj-rest-auth/pull/110.
     'allauth.socialaccount',
     'user',
-
     'revproxy',
-    'example'
+    'problem',
 ]
 
 MIDDLEWARE = [
@@ -67,4 +66,38 @@
 
 REST_AUTH = {
     "USER_DETAILS_SERIALIZER": "user.serializers.CustomUserDetailsSerializer",
-}
+}
+
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "verbose": {
+            "format": "{levelname} {asctime} {module} {message}",
+            "style": "{",
+        },
+        "simple": {
+            "format": "{levelname} {message}",
+            "style": "{",
+        },
+    },
+    "handlers": {
+        "console": {
+            "level": "INFO",
+            "class": "logging.StreamHandler",
+            "formatter": "simple",
+        },
+    },
+    "loggers": {
+        "django": {
+            "handlers": ["console"],
+            "level": "INFO",
+            "propagate": False,
+        },
+        "LangProAnnotator": {
+            "handlers": ["console"],
+            "level": "INFO",
+            "propagate": False,
+        },
+    },
+}

backend/example/models.py

@@ -0,0 +1,3 @@
+import logging
+
+logger = logging.getLogger('LangProAnnotator')

backend/example/views.py

@@ -2,10 +2,12 @@
 from django.views.decorators.csrf import ensure_csrf_cookie
 
 from revproxy.views import ProxyView
+
 view = ProxyView.as_view(upstream=settings.PROXY_FRONTEND)
 
+
 @ensure_csrf_cookie
 def proxy_frontend(*args, **kwargs):
-    """ Wrapper for calls to the SPA ensuring the precense of a CSRF cookie."""
+    """Wrapper for calls to the SPA ensuring the presence of a CSRF cookie."""
     global view
     return view(*args, **kwargs)

backend/langpro_annotator/common_settings.py

@@ -13,6 +13,7 @@
     1. Import the include() function: from django.conf.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+
 from django.conf import settings
 from django.urls import path, re_path, include
 from django.contrib import admin
@@ -24,28 +25,28 @@
 from .proxy_frontend import proxy_frontend
 from .i18n import i18n
 
-from example.views import hooray as ExampleView # DELETEME, see below
-
 api_router = routers.DefaultRouter()  # register viewsets with this router
 
 
 if settings.PROXY_FRONTEND:
-    spa_url = re_path(r'^(?P<path>.*)$', proxy_frontend)
+    spa_url = re_path(r"^(?P<path>.*)$", proxy_frontend)
 else:
-    spa_url = re_path(r'', index)
+    spa_url = re_path(r"", index)
 
 urlpatterns = [
-    path('api/example/', ExampleView), # this is just an example, please delete and utilize router above.
-    path('admin', RedirectView.as_view(url='/admin/', permanent=True)),
-    path('api', RedirectView.as_view(url='/api/', permanent=True)),
-    path('api-auth', RedirectView.as_view(url='/api-auth/', permanent=True)),
-    path('admin/', admin.site.urls),
-    path('api/', include(api_router.urls)),
-    path('api-auth/', include(
-        'rest_framework.urls',
-        namespace='rest_framework',
-    )),
-    path('api/i18n/', i18n),path("users/", include("user.urls")),
-
+    path("admin", RedirectView.as_view(url="/admin/", permanent=True)),
+    path("api", RedirectView.as_view(url="/api/", permanent=True)),
+    path("api-auth", RedirectView.as_view(url="/api-auth/", permanent=True)),
+    path("admin/", admin.site.urls),
+    path("api/", include(api_router.urls)),
+    path(
+        "api-auth/",
+        include(
+            "rest_framework.urls",
+            namespace="rest_framework",
+        ),
+    ),
+    path("api/i18n/", i18n),
+    path("users/", include("user.urls")),
     spa_url,  # catch-all; unknown paths to be handled by a SPA
 ]