More frontend fixes

README.md

@@ -86,7 +86,7 @@ The application will run in a Kubernetes cluster, so we need a container image f
 Creating the container image might take several minutes, so this is a good point to take a break. When you return, you should see the following output:
 
 > ```
-> Packed dashboard_0.24_amd64.rock
+> Packed dashboard_0.25_amd64.rock
 > ```
 
 ### Create a charm
@@ -109,10 +109,10 @@ Creating the charm might take several minutes, so this is another good point to
 ``` { name=deploy-dashboard }
 cd ~/dashboard
 rockcraft.skopeo --insecure-policy copy --dest-tls-verify=false \
-  oci-archive:dashboard_0.24_amd64.rock \
-  docker://localhost:32000/dashboard:0.24
+  oci-archive:dashboard_0.25_amd64.rock \
+  docker://localhost:32000/dashboard:0.25
 juju deploy ./charm/dashboard_ubuntu-22.04-amd64.charm \
-  --resource django-app-image=localhost:32000/dashboard:0.24
+  --resource django-app-image=localhost:32000/dashboard:0.25
 ```
 
 The `rockcraft.skopeo` command makes the container image available to Juju.

dashboard/dashboard/settings.py

@@ -131,3 +131,6 @@
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+LOGIN_REDIRECT_URL = "projects:project_list"
+LOGOUT_REDIRECT_URL = "projects:project_list"

dashboard/dashboard/templates/registration/login.html

@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+  <h2>Log in</h2>
+  <form method="post">
+    {% csrf_token %}
+    {{ form }}
+    <button type="submit">Log In</button>
+  </form>
+
+{% endblock %}

dashboard/dashboard/urls.py

@@ -4,6 +4,7 @@
 urlpatterns = [
     path("admin/doc/", include("django.contrib.admindocs.urls")),
     path("admin/", admin.site.urls),
+    path("accounts/", include("django.contrib.auth.urls")),
     path("__reload__/", include("django_browser_reload.urls")),
     path("", include("projects.urls")),
 ]

dashboard/initial_data.yaml

@@ -478,7 +478,7 @@
   pk: 1
   fields:
     name: Nuclear
-    url: ''
+    url: https://nuclear.org
     group: 1
     owner: A. Scientist
     driver: A. Technician
@@ -489,7 +489,7 @@
   pk: 2
   fields:
     name: Chemistry
-    url: https://nuclear.nut
+    url: https://chemistry.org
     group: 1
     owner: A. Chemist
     driver: null

dashboard/projects/admin.py

@@ -50,21 +50,6 @@ def has_delete_permission(self, request, obj):
         return False
 
 
-class ProjectObjectiveInline(admin.TabularInline):
-    model = ProjectObjective
-    max_num = 0
-    can_delete = False
-    fields = ("name", "unstarted_reason")
-    readonly_fields = ["name"]
-    exclude = ["objective", "description", "status"]
-
-    def has_add_permission(self, request, obj):
-        return False
-
-    def has_delete_permission(self, request, obj):
-        return False
-
-
 @admin.register(ProjectObjective)
 class ProjectObjectiveAdmin(admin.ModelAdmin):
     readonly_fields = ["project", "objective", "status"]
@@ -95,9 +80,7 @@ def change_view(self, request, object_id, form_url="", extra_context=None):
 
 @admin.register(Project)
 class ProjectAdmin(admin.ModelAdmin):
-    inlines = [
-        ProjectObjectiveInline,
-    ]
+
     list_display = [
         "name",
         "owner",

dashboard/projects/templates/projects/partial_project_basics.html

@@ -1,9 +1,4 @@
 <div id="basic_information">
-
-  {% if not user.is_authenticated %}
-    <div class="auth"><a href="{% url 'admin:index' %}">Log in to edit</a></div>
-  {% endif %}
-
   <div id="basic_form" class="submit-row">
     <form
       hx-post="{% url 'projects:project_basic_form_save' project.id %}"

dashboard/projects/templates/projects/project.html

@@ -14,27 +14,47 @@
 
 {% block content %}
 
-<h1>{{ project }}</h1>
+  <div id="container">
 
-<div id="container">
-  <div class="main" id="main">
-    <main id="content-start" class="content">
-      <div id="content" class="colM">
-        <div id="content-main">
+    <nav class="navigation">
+      <ul>
+        <li><a href="/">Dashboard</a></li>
+        {% if user.is_authenticated %}
+          <li><a href="{% url 'admin:index' %}">Admin</a></li>
+          <li>Logged in as {{ user.username }}</li>
+          <li>
+            <form action="{% url 'logout' %}" method="post">
+              {% csrf_token %}
+              <button type="submit">Log out</button>
+            </form>
+          </li>
+        {% else %}
+          <li><a href="{% url 'login' %}?next={{ request.path }}">Log in</a></li>
+        {% endif %}
+      </ul>
+    </nav>
 
-          <div>{% include "projects/partial_project_basics.html" %}</div>
+    <h1>{{ project }}</h1>
 
-          <hr>
+    <div class="main" id="main">
+      <main id="content-start" class="content">
+        <div id="content" class="colM">
+          <div id="content-main">
 
-          <div>{% include "projects/partial_project_commitments.html" %}</div>
+            <div>{% include "projects/partial_project_basics.html" %}</div>
 
-          <hr>
+            <hr>
 
-          {% include "projects/partial_projectobjectives.html" %}
+            <div>{% include "projects/partial_project_commitments.html" %}</div>
 
+            <hr>
+
+            {% include "projects/partial_projectobjectives.html" %}
+
+          </div>
         </div>
-      </div>
-    </main>
+      </main>
+    </div>
   </div>
-</div>
+
 {% endblock content %}

dashboard/tests.py

@@ -58,7 +58,7 @@ def test_toggling_conditions(live_server, page):
     # after toggling, the new conditions should be saved in the database
     page.get_by_test_id("toggle_condition_94").uncheck()
     page.get_by_test_id("toggle_condition_102").check()
-    time.sleep(0.5)  # Temporary workaround. Find a better solution.
+    time.sleep(5)  # Temporary workaround. Find a better solution.
 
     assert ProjectObjectiveCondition.objects.get(id=94).done == False
     assert ProjectObjectiveCondition.objects.get(id=102).done == True
@@ -70,7 +70,7 @@ def test_toggling_conditions(live_server, page):
 
     page.get_by_test_id("toggle_commitment_705").check()
     page.get_by_test_id("toggle_commitment_474").uncheck()
-    time.sleep(0.5)  # Temporary workaround. Find a better solution.
+    time.sleep(5)  # Temporary workaround. Find a better solution.
 
     assert Commitment.objects.get(id=705).committed == True
     assert Commitment.objects.get(id=474).committed == False
@@ -88,13 +88,15 @@ def test_toggling_conditions(live_server, page):
 
     # check the remaining box to get to Started
     page.get_by_test_id("toggle_condition_10").check()
+    time.sleep(5)  # Temporary workaround. Find a better solution.
     assert ProjectObjectiveCondition.objects.get(
         id=10
     ).projectobjective().status() == Level.objects.get(id=1)
     expect(page.get_by_test_id("projectobjective_status_1")).to_contain_text("Started")
 
     # check one more to get to First results
     page.get_by_test_id("toggle_condition_14").check()
+    time.sleep(5)  # Temporary workaround. Find a better solution.
     assert ProjectObjectiveCondition.objects.get(
         id=14
     ).projectobjective().status() == Level.objects.get(id=1)

dashboard_rock_patch/dashboard/settings.py

@@ -151,3 +151,6 @@
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+LOGIN_REDIRECT_URL = "projects:project_list"
+LOGOUT_REDIRECT_URL = "projects:project_list"

rockcraft.yaml

@@ -2,7 +2,7 @@ name: dashboard
 # see https://documentation.ubuntu.com/rockcraft/en/1.8.0/explanation/bases/
 # for more information about bases and using 'bare' bases for chiselled rocks
 base: ubuntu@22.04 # the base environment for this Django application
-version: "0.24" # just for humans. Semantic versioning is recommended
+version: "0.25" # just for humans. Semantic versioning is recommended
 summary: A summary of your Django application # 79 char long summary
 description: |
   Dashboard is a Django application to track quality and progress of multiple