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 00000000..294d77c5 Binary files /dev/null and b/core/static_src/img/core/child-placeholder.png differ diff --git a/core/static_src/scss/core.scss b/core/static_src/scss/core.scss new file mode 100644 index 00000000..1c6a0a6e --- /dev/null +++ b/core/static_src/scss/core.scss @@ -0,0 +1,5 @@ +#view-child { + .child-photo { + max-width: 150px; + } +} diff --git a/core/templates/core/child_detail.html b/core/templates/core/child_detail.html index 58e31585..7cfa5f67 100644 --- a/core/templates/core/child_detail.html +++ b/core/templates/core/child_detail.html @@ -1,4 +1,5 @@ {% extends 'babybuddy/page.html' %} +{% load static %} {% block title %}{{ object }}{% endblock %} @@ -9,48 +10,12 @@ {% block content %}
-
{{ 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 00000000..e69de29b diff --git a/dashboard/templates/dashboard/child_button_group.html b/dashboard/templates/dashboard/child_button_group.html new file mode 100644 index 00000000..8bf1815f --- /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 2c3fd784..1591a938 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 ebcd854f..99547c35 100644 --- a/dashboard/tests/tests_views.py +++ b/dashboard/tests/tests_views.py @@ -31,17 +31,20 @@ class ViewsTestCase(TestCase): 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 @@ class ViewsTestCase(TestCase): 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 213029d2..9eee8a70 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals 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 @@ from core.models import Child 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 ae946c7f..3e30442f 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 ccbaba06..3b573edb 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 5c0623cd..aca832db 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 a14ec6b2..32631c90 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",