From e2733e6b1e78b53eed7f396af0daae8ffba0e3a1 Mon Sep 17 00:00:00 2001 From: Christopher Charbonneau Wells Date: Mon, 6 Nov 2017 16:24:21 -0500 Subject: [PATCH] Improve Dashboard view. This commit adds a placeholder image for Child objects (in the future, hopefully, photo uploads will be added) and reworks the Dashboard view to look better when more than one child is in the database. There are also some minor tweaks to the Child detail view and one new Gulp requirement to improve the flow of copying static image assets from apps. --- .../static_src/img/core/child-placeholder.png | Bin 0 -> 6393 bytes core/static_src/scss/core.scss | 5 ++ core/templates/core/child_detail.html | 43 ++--------------- dashboard/static_src/scss/dashboard.scss | 0 .../dashboard/child_button_group.html | 37 +++++++++++++++ dashboard/templates/dashboard/dashboard.html | 44 ++++++++++-------- dashboard/tests/tests_views.py | 19 ++++---- dashboard/views.py | 22 +++++---- gulpfile.js/config.js | 4 ++ gulpfile.js/tasks/extras.js | 11 ++++- package-lock.json | 9 ++++ package.json | 1 + 12 files changed, 117 insertions(+), 78 deletions(-) create mode 100644 core/static_src/img/core/child-placeholder.png create mode 100644 core/static_src/scss/core.scss create mode 100644 dashboard/static_src/scss/dashboard.scss create mode 100644 dashboard/templates/dashboard/child_button_group.html diff --git a/core/static_src/img/core/child-placeholder.png b/core/static_src/img/core/child-placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..294d77c5c5a90c8959747a57161c193d66c5df40 GIT binary patch literal 6393 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 cMiEj2_;W; -
{{ object }}
+ +
{{ object }}

Born {{ object.birth_date }}
Age {{ object.birth_date|timesince }}

- -
- - {% if perms.core.view_child %} - - - - {% endif %} - -
- -
- Diaper Change Types - Diaper Lifetimes - Sleep Pattern - Sleep Totals - Timeline -
-
- - {% if perms.core.change_child %} - - {% endif %} - - {% if perms.core.delete_child %} - - {% endif %} - -
+ {% include 'dashboard/child_button_group.html' %} {% endblock %} \ No newline at end of file diff --git a/dashboard/static_src/scss/dashboard.scss b/dashboard/static_src/scss/dashboard.scss new file mode 100644 index 000000000..e69de29bb diff --git a/dashboard/templates/dashboard/child_button_group.html b/dashboard/templates/dashboard/child_button_group.html new file mode 100644 index 000000000..8bf1815f3 --- /dev/null +++ b/dashboard/templates/dashboard/child_button_group.html @@ -0,0 +1,37 @@ +
+ + {% if perms.core.view_child %} + + + + {% endif %} + +
+ +
+ Diaper Change Types + Diaper Lifetimes + Sleep Pattern + Sleep Totals + Timeline +
+
+ + {% if perms.core.change_child %} + + {% endif %} + + {% if perms.core.delete_child %} + + {% endif %} + +
\ No newline at end of file diff --git a/dashboard/templates/dashboard/dashboard.html b/dashboard/templates/dashboard/dashboard.html index 2c3fd7847..1591a938d 100644 --- a/dashboard/templates/dashboard/dashboard.html +++ b/dashboard/templates/dashboard/dashboard.html @@ -1,27 +1,31 @@ {% extends 'babybuddy/page.html' %} +{% load static %} -{% block title %}Welcome!{% endblock %} +{% block title %}Dashboard{% endblock %} + +{% block breadcrumbs %} +
  • Dashboard
    • +{% endblock %} {% block content %} -
    - {% for child in objects %} -
    - -
    -

    - {{ child.name }} - {{ child.birth_date }} -

    -

    - {% if perms.core.view_child %} - - - - {% endif %} -

    -
    -
    - ... +
    + {% for object in objects %} +
    +
    + + + +
    +

    {{ object }}

    +
    +

    + Born {{ object.birth_date }}
    + Age {{ object.birth_date|timesince }} +

    + {% include 'dashboard/child_button_group.html' %} +
    +
    {% endfor %} diff --git a/dashboard/tests/tests_views.py b/dashboard/tests/tests_views.py index ebcd854fa..99547c352 100644 --- a/dashboard/tests/tests_views.py +++ b/dashboard/tests/tests_views.py @@ -31,17 +31,20 @@ def setUpClass(cls): cls.c.login(**cls.credentials) def test_dashboard_views(self): - page = self.c.get('/dashboard/') - self.assertEqual(page.status_code, 200) - - """ Dashboard handles the root URL and redirects based on zero, one, or + """Dashboard handles the root URL and redirects based on zero, one, or more than one child is in the database.""" page = self.c.get('/') + self.assertEqual(page.url, '/dashboard/') + page = self.c.get('/dashboard/') self.assertEqual(page.url, '/children/add/') - call_command('fake', verbosity=0, children=1) + call_command('fake', verbosity=0, children=1, days=1) child = Child.objects.first() - page = self.c.get('/') + page = self.c.get('/dashboard/') + self.assertEqual( + page.url, '/children/{}/dashboard/'.format(child.slug)) + + page = self.c.get('/dashboard/') self.assertEqual( page.url, '/children/{}/dashboard/'.format(child.slug)) # Test the actual child dashboard (including cards). @@ -54,5 +57,5 @@ def test_dashboard_views(self): last_name='Child', birth_date='2000-01-01' ) - page = self.c.get('/') - self.assertEqual(page.url, '/dashboard/') + page = self.c.get('/dashboard/') + self.assertEqual(page.status_code, 200) diff --git a/dashboard/views.py b/dashboard/views.py index 213029d28..9eee8a70a 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -3,6 +3,7 @@ from django.contrib.auth.mixins import (LoginRequiredMixin, PermissionRequiredMixin) +from django.http import HttpResponseRedirect from django.urls import reverse from django.views.generic.base import TemplateView, RedirectView from django.views.generic.detail import DetailView @@ -11,22 +12,23 @@ class DashboardRedirect(LoginRequiredMixin, RedirectView): + url = '/dashboard/' + + +class Dashboard(LoginRequiredMixin, TemplateView): + # TODO: Use .card-deck in this template once BS4 is finalized. + template_name = 'dashboard/dashboard.html' + # Show the overall dashboard or a child dashboard if one Child instance. def get(self, request, *args, **kwargs): children = Child.objects.count() if children == 0: # TODO: Create some sort of welcome page. - self.url = reverse('child-add') + return HttpResponseRedirect(reverse('child-add')) elif children == 1: - child_instance = Child.objects.first() - self.url = reverse('dashboard-child', args={child_instance.slug}) - else: - self.url = reverse('dashboard') - return super(DashboardRedirect, self).get(request, *args, **kwargs) - - -class Dashboard(LoginRequiredMixin, TemplateView): - template_name = 'dashboard/dashboard.html' + return HttpResponseRedirect( + reverse('dashboard-child', args={Child.objects.first().slug})) + return super(Dashboard, self).get(request, *args, **kwargs) def get_context_data(self, **kwargs): context = super(Dashboard, self).get_context_data(**kwargs) diff --git a/gulpfile.js/config.js b/gulpfile.js/config.js index ae946c7f5..3e30442f1 100644 --- a/gulpfile.js/config.js +++ b/gulpfile.js/config.js @@ -15,6 +15,10 @@ module.exports = { dest: basePath + 'fonts/', files: 'node_modules/font-awesome/fonts/*' }, + images: { + dest: basePath + 'img/', + files: '**/static_src/img/**/*' + }, root: { dest: basePath + 'root/', files: 'babybuddy/static_src/root/*' diff --git a/gulpfile.js/tasks/extras.js b/gulpfile.js/tasks/extras.js index ccbaba069..3b573edb1 100644 --- a/gulpfile.js/tasks/extras.js +++ b/gulpfile.js/tasks/extras.js @@ -1,11 +1,12 @@ var gulp = require('gulp'); +var flatten = require('gulp-flatten'); var pump = require('pump'); var extrasConfig = require('../config.js').extrasConfig; -gulp.task('extras', ['extras:fonts', 'extras:root']); +gulp.task('extras', ['extras:fonts', 'extras:images', 'extras:root']); gulp.task('extras:fonts', function(cb) { pump([ @@ -14,6 +15,14 @@ gulp.task('extras:fonts', function(cb) { ], cb); }); +gulp.task('extras:images', function(cb) { + pump([ + gulp.src(extrasConfig.images.files), + flatten({ subPath: 3 }), + gulp.dest(extrasConfig.images.dest) + ], cb); +}); + gulp.task('extras:root', function(cb) { pump([ gulp.src(extrasConfig.root.files), diff --git a/package-lock.json b/package-lock.json index 5c0623cdb..aca832db8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4000,6 +4000,15 @@ "vinyl-sourcemaps-apply": "0.2.1" } }, + "gulp-flatten": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/gulp-flatten/-/gulp-flatten-0.3.1.tgz", + "integrity": "sha1-Uef+wTozxARXjRjBWJ0bW8Rf4dY=", + "requires": { + "gulp-util": "3.0.8", + "through2": "2.0.3" + } + }, "gulp-sass": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.1.0.tgz", diff --git a/package.json b/package.json index a14ec6b23..32631c906 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "gulp": "^3.9.1", "gulp-concat": "^2.6.1", "gulp-csso": "^3.0.0", + "gulp-flatten": "^0.3.1", "gulp-sass": "^3.1.0", "gulp-sass-glob": "^1.0.8", "gulp-sass-lint": "^1.3.4",