From 5d4beea512699065f6a3f4943cabf7522297dcc9 Mon Sep 17 00:00:00 2001
From: Christopher Charbonneau Wells <chris@chrxs.net>
Date: Fri, 18 Aug 2017 08:17:45 -0400
Subject: [PATCH] Add slug-based child URLs.

Also some beginnings of the dashboard system (WIP).
---
 .../templates/babyblotter/nav-dropdown.html   |  2 +-
 core/templates/core/child_list.html           |  4 +--
 core/templates/core/dashboard.html            | 30 +++++++++++++++++++
 core/templates/core/index.html                |  5 ----
 core/urls.py                                  |  6 +++-
 core/views.py                                 |  2 +-
 6 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 core/templates/core/dashboard.html
 delete mode 100644 core/templates/core/index.html

diff --git a/babyblotter/templates/babyblotter/nav-dropdown.html b/babyblotter/templates/babyblotter/nav-dropdown.html
index 6171e3ba..9dcd6e96 100644
--- a/babyblotter/templates/babyblotter/nav-dropdown.html
+++ b/babyblotter/templates/babyblotter/nav-dropdown.html
@@ -14,7 +14,7 @@
         <div class="collapse navbar-collapse" id="navbarsExampleDefault">
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item{% if request.path == '/' %} active{% endif %}">
-                    <a class="nav-link" href="{% url 'index' %}">
+                    <a class="nav-link" href="{% url 'dashboard' %}">
                         <i class="fa fa-dashboard" aria-hidden="true"></i> Dashboard
                     </a>
                 </li>
diff --git a/core/templates/core/child_list.html b/core/templates/core/child_list.html
index eefe7453..c05be7f4 100644
--- a/core/templates/core/child_list.html
+++ b/core/templates/core/child_list.html
@@ -27,13 +27,13 @@
                             <div class="btn-group btn-group-sm" role="group" aria-label="Actions">
 
                                 {% if perms.core.change_child %}
-                                    <a href="{% url 'child-update' child.id %}" class="btn btn-primary">
+                                    <a href="{% url 'child-update' child.slug %}" class="btn btn-primary">
                                         <i class="fa fa-pencil" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_child %}
-                                    <a href="{% url 'child-delete' child.id %}" class="btn btn-danger">
+                                    <a href="{% url 'child-delete' child.slug %}" class="btn btn-danger">
                                         <i class="fa fa-trash-o" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
diff --git a/core/templates/core/dashboard.html b/core/templates/core/dashboard.html
new file mode 100644
index 00000000..d76038a4
--- /dev/null
+++ b/core/templates/core/dashboard.html
@@ -0,0 +1,30 @@
+{% extends 'babyblotter/page.html' %}
+
+{% block title %}Welcome!{% endblock %}
+
+{% block content %}
+    <div class="container">
+        <div class="row align-items-start text-center">
+            <div class="col-sm-12 col-md-4 border">
+                awake time
+            </div>
+            <div class="col-sm-12 col-md-4 border">
+                last feeding
+            </div>
+            <div class="col-sm-12 col-md-4 border">
+                change statistics
+            </div>
+        </div>
+        <div class="row align-items-start text-center">
+            <div class="col-sm-12 col-md-4 border">
+                tummy time for the day
+            </div>
+            <div class="col-sm-12 col-md-4 border">
+                available
+            </div>
+            <div class="col-sm-12 col-md-4 border">
+                available
+            </div>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
deleted file mode 100644
index 1fcd6c7f..00000000
--- a/core/templates/core/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'babyblotter/page.html' %}
-
-{% block title %}Welcome!{% endblock %}
-
-{% block content %}<h1>Hello!</h1>{% endblock %}
\ No newline at end of file
diff --git a/core/urls.py b/core/urls.py
index e8b571cb..e5c0470b 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -6,14 +6,18 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.Dashboard.as_view(), name='index'),
+    url(r'^$', views.Dashboard.as_view(), name='dashboard'),
 
     url(r'children/$', views.ChildList.as_view(), name='child-list'),
     url(r'children/add/$', views.ChildAdd.as_view(), name='child-add'),
     url(r'children/(?P<pk>[0-9]+)/$', views.ChildUpdate.as_view(),
         name='child-update'),
+    url(r'children/(?P<slug>[^/.]+)/$', views.ChildUpdate.as_view(),
+        name='child-update'),
     url(r'children/(?P<pk>[0-9]+)/delete/$', views.ChildDelete.as_view(),
         name='child-delete'),
+    url(r'children/(?P<slug>[^/.]+)/delete/$', views.ChildDelete.as_view(),
+        name='child-delete'),
 
     url(r'changes/$', views.DiaperChangeList.as_view(),
         name='diaperchange-list'),
diff --git a/core/views.py b/core/views.py
index 9f502020..e9961125 100644
--- a/core/views.py
+++ b/core/views.py
@@ -16,7 +16,7 @@ from .forms import (ChildForm, DiaperChangeForm, FeedingForm, SleepForm,
 
 
 class Dashboard(LoginRequiredMixin, TemplateView):
-    template_name = 'core/index.html'
+    template_name = 'core/dashboard.html'
 
 
 class ChildList(PermissionRequiredMixin, ListView):