Run pre-commit

.gitignore

@@ -128,4 +128,4 @@ dmypy.json
 .pyre/
 
 # IDE related ignores
-.vscode
+.vscode

Dockerfile

@@ -37,4 +37,4 @@ USER wagtail
 EXPOSE 5000
 
 # Run the server
-CMD set -xe; gunicorn --worker-tmp-dir /dev/shm core.wsgi:application --bind 0.0.0.0:5000 --workers 3
+CMD set -xe; gunicorn --worker-tmp-dir /dev/shm core.wsgi:application --bind 0.0.0.0:5000 --workers 3

Procfile

@@ -1 +1 @@
-release: python manage.py migrate
+release: python manage.py migrate

README.md

@@ -1,6 +1,6 @@
 # GeriLife Caregiving
-A toolkit for caregivers working to promote wellness in elder-care communities.
 
+A toolkit for caregivers working to promote wellness in elder-care communities.
 
 ## License
 

project/accounts/admin.py

@@ -4,9 +4,10 @@
 from .forms import CustomUserChangeForm, CustomUserCreationForm
 from .models import User
 
+
 @admin.register(User)
 class CustomUserAdmin(UserAdmin):
     add_form = CustomUserCreationForm
     form = CustomUserChangeForm
     model = User
-    list_display = ['email', 'username',]
+    list_display = ["email", "username"]

project/accounts/apps.py

@@ -2,5 +2,5 @@
 
 
 class AccountsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'accounts'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "accounts"

project/accounts/forms.py

@@ -1,18 +1,15 @@
-from django import forms
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 
 from .models import User
 
 
 class CustomUserCreationForm(UserCreationForm):
-
     class Meta:
         model = User
-        fields = ('username', 'email',)
+        fields = ("username", "email")
 
 
 class CustomUserChangeForm(UserChangeForm):
-
     class Meta:
         model = User
-        fields = ('username', 'email',)
+        fields = ("username", "email")

project/accounts/models.py

@@ -1,14 +1,12 @@
 from django.contrib.auth.models import AbstractUser
-from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 
 class User(AbstractUser):
-
     class Meta:
         db_table = "user"
         verbose_name = _("user")
         verbose_name_plural = _("users")
-    
+
     def __str__(self):
-        return self.username
+        return self.username

project/accounts/templates/registration/login.html

@@ -6,11 +6,11 @@
 {% block title %}Log in{% endblock title %}
 
 {% block content %}
-<h1>{% translate "Log in" %}</h1>
+    <h1>{% translate "Log in" %}</h1>
 
-<form action="" method=post>
-    {% csrf_token %}
-    {{ form | crispy }}
-    <button class="btn btn-primary" type="submit">{% translate "Log in" %}</button>
-</form>
-{% endblock content %}
+    <form action="" method=post>
+        {% csrf_token %}
+        {{ form | crispy }}
+        <button class="btn btn-primary" type="submit">{% translate "Log in" %}</button>
+    </form>
+{% endblock content %}

project/accounts/templates/registration/signup.html

@@ -6,11 +6,11 @@
 {% block title %}{% translate "Sign up" %}{% endblock title %}
 
 {% block content %}
-<h1>{% translate "Sign up" %}</h1>
+    <h1>{% translate "Sign up" %}</h1>
 
-<form action="" method=post>
-    {% csrf_token %}
-    {{ form | crispy }}
-    <button class="btn btn-primary" type="submit">{% translate "Sign up" %}</button>
-</form>
-{% endblock content %}
+    <form action="" method=post>
+        {% csrf_token %}
+        {{ form | crispy }}
+        <button class="btn btn-primary" type="submit">{% translate "Sign up" %}</button>
+    </form>
+{% endblock content %}

project/accounts/tests.py

@@ -1,3 +1 @@
-from django.test import TestCase
-
 # Create your tests here.

project/accounts/views.py

@@ -3,6 +3,7 @@
 
 from .forms import CustomUserCreationForm
 
+
 class SignUpView(CreateView):
     form_class = CustomUserCreationForm
     success_url = reverse_lazy("home")

project/activities/forms.py

@@ -9,4 +9,4 @@ class Meta:
         fields = "__all__"
         widgets = {
             "date": forms.DateInput(attrs={"type": "date"}),
-        }
+        }

project/activities/models.py

@@ -3,13 +3,11 @@
 
 
 class Activity(models.Model):
-    """
-    Model representing an activity.
-    """
+    """Model representing an activity."""
+
     class ActivityTypeChoices(models.TextChoices):
-        """
-        Choices for the type of activity.
-        """
+        """Choices for the type of activity."""
+
         OUTDOOR = "outdoor", _("Outdoor")
         CULTURE = "culture", _("Culture")
         DISCUSSION = "discussion", _("Discussion")
@@ -34,7 +32,7 @@ class ActivityTypeChoices(models.TextChoices):
         _("Duration in minutes"),
         default=30,
     )
-    
+
     class Meta:
         db_table = "activity"
         verbose_name = _("activity")

project/activities/templates/activities/form.html

@@ -5,11 +5,11 @@
 {% block title %}Add activity{% endblock title %}
 
 {% block content %}
-<form action="{% url 'activity-form-view' %}" method="post">
-    {% csrf_token %}
+    <form action="{% url 'activity-form-view' %}" method="post">
+        {% csrf_token %}
 
-    {{ form|crispy }}
+        {{ form|crispy }}
 
-    <button type="submit" class="btn btn-primary">Add activity</button>
-</form>
-{% endblock content %}
+        <button type="submit" class="btn btn-primary">Add activity</button>
+    </form>
+{% endblock content %}

project/activities/templates/activities/list.html

@@ -25,5 +25,6 @@ <h1>Activities</h1>
                     <td>{{ activity.duration_minutes }}</td>
                 </tr>
             {% endfor %}
+        </tbody>
     </table>
 {% endblock %}

project/activities/tests.py

@@ -1,3 +1 @@
-from django.test import TestCase
-
 # Create your tests here.

project/activities/urls.py

@@ -1,11 +1,9 @@
 from django.urls import path
-from django.utils.translation import gettext_lazy as _
 
 from .views import ActivityFormView, ActivityListView
 
 
 urlpatterns = [
-
     path(
         # . Translators: Make sure to leave the trailing slash "/"
         "submit/",

project/caregivers/admin.py

@@ -2,6 +2,7 @@
 
 from .models import CaregiverRole
 
+
 @admin.register(CaregiverRole)
 class CaregiverRoleAdmin(admin.ModelAdmin):
     pass

project/caregivers/apps.py

@@ -2,5 +2,5 @@
 
 
 class CaregiversConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'caregivers'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "caregivers"

project/caregivers/tests.py

@@ -1,3 +1 @@
-from django.test import TestCase
-
 # Create your tests here.

project/caregivers/views.py

@@ -1,3 +1 @@
-from django.shortcuts import render
-
 # Create your views here.

project/core/asgi.py

@@ -1,5 +1,4 @@
-"""
-ASGI config for core project.
+"""ASGI config for core project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -11,6 +10,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "core.settings")
 
 application = get_asgi_application()

project/core/settings.py

@@ -1,5 +1,4 @@
-"""
-Django settings for core project.
+"""Django settings for core project.
 
 Generated by 'django-admin startproject' using Django 4.0.
 
@@ -152,7 +151,14 @@
 
 STATIC_URL = "static/"
 STATIC_ROOT = BASE_DIR / "static"
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

project/core/urls.py

@@ -1,4 +1,4 @@
-"""core URL Configuration
+"""Core URL Configuration.
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/4.0/topics/http/urls/
@@ -15,7 +15,6 @@
 """
 from django.contrib import admin
 from django.urls import include, path
-from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import TemplateView
 
 urlpatterns = [

project/core/wsgi.py

@@ -1,5 +1,4 @@
-"""
-WSGI config for core project.
+"""WSGI config for core project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +10,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "core.settings")
 
 application = get_wsgi_application()

project/homes/admin.py

@@ -2,6 +2,7 @@
 
 from .models import Home
 
+
 @admin.register(Home)
 class HomeAdmin(admin.ModelAdmin):
-    pass
+    pass

project/homes/apps.py

@@ -2,5 +2,5 @@
 
 
 class HomesConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'homes'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "homes"