From e45101b75cd116ad24556a1346b86b72eb377c02 Mon Sep 17 00:00:00 2001 From: Christopher Charbonneau Wells Date: Sun, 22 Oct 2017 14:00:42 -0400 Subject: [PATCH] Rename project Baby Buddy. --- .gitignore | 2 +- api/permissions.py | 2 +- babyblotter/static_src/js/babyblotter.js | 12 ------------ babyblotter/templates/admin/base_site.html | 9 --------- {babyblotter => babybuddy}/__init__.py | 0 .../management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/fake.py | 0 .../management/commands/reset.py | 2 +- .../migrations/__init__.py | 0 .../settings/__init__.py | 0 {babyblotter => babybuddy}/settings/base.py | 8 ++++---- .../settings/development.py | 0 babybuddy/static_src/js/babyblotter.js | 12 ++++++++++++ .../static_src/scss/_functions.scss | 2 +- .../static_src/scss/_global.scss | 2 +- .../static_src/scss/_mixins.scss | 2 +- .../static_src/scss/_variables.scss | 2 +- .../static_src/scss/babybuddy.scss | 0 .../static_src/scss/themes/blueorange.scss | 0 babybuddy/templates/admin/base_site.html | 9 +++++++++ .../templates/babybuddy}/base.html | 18 +++++++++--------- .../templates/babybuddy}/form.html | 0 .../templates/babybuddy}/nav-dropdown.html | 4 ++-- .../templates/babybuddy}/page.html | 2 +- .../templates/babybuddy}/paginator.html | 0 .../templates/registration/base.html | 4 ++-- .../templates/registration/login.html | 0 .../registration/password_reset_complete.html | 0 .../registration/password_reset_confirm.html | 0 .../registration/password_reset_done.html | 0 .../registration/password_reset_form.html | 0 {babyblotter => babybuddy}/urls.py | 0 {babyblotter => babybuddy}/wsgi.py | 2 +- core/static_src/js/timer.js | 4 ++-- core/templates/core/child_confirm_delete.html | 2 +- core/templates/core/child_detail.html | 2 +- core/templates/core/child_form.html | 4 ++-- core/templates/core/child_list.html | 4 ++-- .../core/diaperchange_confirm_delete.html | 2 +- core/templates/core/diaperchange_form.html | 4 ++-- core/templates/core/diaperchange_list.html | 4 ++-- .../templates/core/feeding_confirm_delete.html | 2 +- core/templates/core/feeding_form.html | 4 ++-- core/templates/core/feeding_list.html | 4 ++-- core/templates/core/note_confirm_delete.html | 2 +- core/templates/core/note_form.html | 4 ++-- core/templates/core/note_list.html | 4 ++-- core/templates/core/sleep_confirm_delete.html | 2 +- core/templates/core/sleep_form.html | 4 ++-- core/templates/core/sleep_list.html | 4 ++-- core/templates/core/timer_confirm_delete.html | 2 +- core/templates/core/timer_detail.html | 4 ++-- core/templates/core/timer_form.html | 4 ++-- core/templates/core/timer_list.html | 4 ++-- .../core/tummytime_confirm_delete.html | 2 +- core/templates/core/tummytime_form.html | 4 ++-- core/templates/core/tummytime_list.html | 4 ++-- dashboard/templates/dashboard/child.html | 2 +- dashboard/templates/dashboard/dashboard.html | 2 +- gulpfile.js/config.js | 10 +++++----- manage.py | 2 +- package-lock.json | 2 +- package.json | 2 +- reports/templates/reports/report_base.html | 6 +++--- 65 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 babyblotter/static_src/js/babyblotter.js delete mode 100644 babyblotter/templates/admin/base_site.html rename {babyblotter => babybuddy}/__init__.py (100%) rename {babyblotter => babybuddy}/management/__init__.py (100%) rename {babyblotter => babybuddy}/management/commands/__init__.py (100%) rename {babyblotter => babybuddy}/management/commands/fake.py (100%) rename {babyblotter => babybuddy}/management/commands/reset.py (99%) rename {babyblotter => babybuddy}/migrations/__init__.py (100%) rename {babyblotter => babybuddy}/settings/__init__.py (100%) rename {babyblotter => babybuddy}/settings/base.py (94%) rename {babyblotter => babybuddy}/settings/development.py (100%) create mode 100644 babybuddy/static_src/js/babyblotter.js rename {babyblotter => babybuddy}/static_src/scss/_functions.scss (57%) rename {babyblotter => babybuddy}/static_src/scss/_global.scss (80%) rename {babyblotter => babybuddy}/static_src/scss/_mixins.scss (57%) rename {babyblotter => babybuddy}/static_src/scss/_variables.scss (74%) rename babyblotter/static_src/scss/babyblotter.scss => babybuddy/static_src/scss/babybuddy.scss (100%) rename {babyblotter => babybuddy}/static_src/scss/themes/blueorange.scss (100%) create mode 100644 babybuddy/templates/admin/base_site.html rename {babyblotter/templates/babyblotter => babybuddy/templates/babybuddy}/base.html (50%) rename {babyblotter/templates/babyblotter => babybuddy/templates/babybuddy}/form.html (100%) rename {babyblotter/templates/babyblotter => babybuddy/templates/babybuddy}/nav-dropdown.html (99%) rename {babyblotter/templates/babyblotter => babybuddy/templates/babybuddy}/page.html (83%) rename {babyblotter/templates/babyblotter => babybuddy/templates/babybuddy}/paginator.html (100%) rename {babyblotter => babybuddy}/templates/registration/base.html (87%) rename {babyblotter => babybuddy}/templates/registration/login.html (100%) rename {babyblotter => babybuddy}/templates/registration/password_reset_complete.html (100%) rename {babyblotter => babybuddy}/templates/registration/password_reset_confirm.html (100%) rename {babyblotter => babybuddy}/templates/registration/password_reset_done.html (100%) rename {babyblotter => babybuddy}/templates/registration/password_reset_form.html (100%) rename {babyblotter => babybuddy}/urls.py (100%) rename {babyblotter => babybuddy}/wsgi.py (58%) diff --git a/.gitignore b/.gitignore index ac289b18..e82be0c7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,5 @@ *.pyc # static files -/babyblotter/static +/babybuddy/static /static diff --git a/api/permissions.py b/api/permissions.py index fa2727a4..fb22c7bb 100644 --- a/api/permissions.py +++ b/api/permissions.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from rest_framework.permissions import DjangoModelPermissions -class BabyBlotterDjangoModelPermissions(DjangoModelPermissions): +class BabyBuddyDjangoModelPermissions(DjangoModelPermissions): perms_map = { 'GET': ['%(app_label)s.view_%(model_name)s'], 'OPTIONS': [], diff --git a/babyblotter/static_src/js/babyblotter.js b/babyblotter/static_src/js/babyblotter.js deleted file mode 100644 index c2ad43c8..00000000 --- a/babyblotter/static_src/js/babyblotter.js +++ /dev/null @@ -1,12 +0,0 @@ -/* Baby Blotter - * - * Default namespace for the Baby Blotter app. - */ -if (typeof jQuery === 'undefined') { - throw new Error('Baby Blotter requires jQuery.') -} - -var BabyBlotter = function () { - var BabyBlotter = {}; - return BabyBlotter; -}(); diff --git a/babyblotter/templates/admin/base_site.html b/babyblotter/templates/admin/base_site.html deleted file mode 100644 index bdeeb981..00000000 --- a/babyblotter/templates/admin/base_site.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "admin/base.html" %} - -{% block title %}{{ title }} | Baby Blotter Admin{% endblock %} - -{% block branding %} -

Baby Blotter Admin

-{% endblock %} - -{% block nav-global %}{% endblock %} diff --git a/babyblotter/__init__.py b/babybuddy/__init__.py similarity index 100% rename from babyblotter/__init__.py rename to babybuddy/__init__.py diff --git a/babyblotter/management/__init__.py b/babybuddy/management/__init__.py similarity index 100% rename from babyblotter/management/__init__.py rename to babybuddy/management/__init__.py diff --git a/babyblotter/management/commands/__init__.py b/babybuddy/management/commands/__init__.py similarity index 100% rename from babyblotter/management/commands/__init__.py rename to babybuddy/management/commands/__init__.py diff --git a/babyblotter/management/commands/fake.py b/babybuddy/management/commands/fake.py similarity index 100% rename from babyblotter/management/commands/fake.py rename to babybuddy/management/commands/fake.py diff --git a/babyblotter/management/commands/reset.py b/babybuddy/management/commands/reset.py similarity index 99% rename from babyblotter/management/commands/reset.py rename to babybuddy/management/commands/reset.py index cea286cf..7c563540 100644 --- a/babyblotter/management/commands/reset.py +++ b/babybuddy/management/commands/reset.py @@ -35,7 +35,7 @@ class Command(BaseCommand): self.stdout.write(self.style.SUCCESS('Database flushed.')) for config in apps.app_configs.values(): - if path.split(path.split(config.path)[0])[1] == 'babyblotter': + if path.split(path.split(config.path)[0])[1] == 'babybuddy': migrate = Migrate() options['app_label'] = config.name options['migration_name'] = 'zero' diff --git a/babyblotter/migrations/__init__.py b/babybuddy/migrations/__init__.py similarity index 100% rename from babyblotter/migrations/__init__.py rename to babybuddy/migrations/__init__.py diff --git a/babyblotter/settings/__init__.py b/babybuddy/settings/__init__.py similarity index 100% rename from babyblotter/settings/__init__.py rename to babybuddy/settings/__init__.py diff --git a/babyblotter/settings/base.py b/babybuddy/settings/base.py similarity index 94% rename from babyblotter/settings/base.py rename to babybuddy/settings/base.py index a0eafb05..4b8c3b8c 100644 --- a/babyblotter/settings/base.py +++ b/babybuddy/settings/base.py @@ -15,7 +15,7 @@ BASE_DIR = os.path.dirname( INSTALLED_APPS = [ 'api', - 'babyblotter', + 'babybuddy', 'core', 'dashboard', 'reports', @@ -48,7 +48,7 @@ MIDDLEWARE = [ # URL dispatcher # https://docs.djangoproject.com/en/1.11/topics/http/urls/ -ROOT_URLCONF = 'babyblotter.urls' +ROOT_URLCONF = 'babybuddy.urls' # Templates @@ -74,7 +74,7 @@ TEMPLATES = [ # WGSI # https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ -WSGI_APPLICATION = 'babyblotter.wsgi.application' +WSGI_APPLICATION = 'babybuddy.wsgi.application' # Authentication @@ -114,7 +114,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static') REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': [ - 'api.permissions.BabyBlotterDjangoModelPermissions' + 'api.permissions.BabyBuddyDjangoModelPermissions' ], 'DEFAULT_RENDERER_CLASSES': ( 'rest_framework.renderers.JSONRenderer', diff --git a/babyblotter/settings/development.py b/babybuddy/settings/development.py similarity index 100% rename from babyblotter/settings/development.py rename to babybuddy/settings/development.py diff --git a/babybuddy/static_src/js/babyblotter.js b/babybuddy/static_src/js/babyblotter.js new file mode 100644 index 00000000..c147889f --- /dev/null +++ b/babybuddy/static_src/js/babyblotter.js @@ -0,0 +1,12 @@ +/* Baby Buddy + * + * Default namespace for the Baby Buddy app. + */ +if (typeof jQuery === 'undefined') { + throw new Error('Baby Buddy requires jQuery.') +} + +var BabyBuddy = function () { + var BabyBuddy = {}; + return BabyBuddy; +}(); diff --git a/babyblotter/static_src/scss/_functions.scss b/babybuddy/static_src/scss/_functions.scss similarity index 57% rename from babyblotter/static_src/scss/_functions.scss rename to babybuddy/static_src/scss/_functions.scss index b45db33a..0e8e00e6 100644 --- a/babyblotter/static_src/scss/_functions.scss +++ b/babybuddy/static_src/scss/_functions.scss @@ -1,3 +1,3 @@ @import '../../../node_modules/bootstrap/scss/functions'; -// Baby Blotter site-wide custom functions. +// Baby Buddy site-wide custom functions. diff --git a/babyblotter/static_src/scss/_global.scss b/babybuddy/static_src/scss/_global.scss similarity index 80% rename from babyblotter/static_src/scss/_global.scss rename to babybuddy/static_src/scss/_global.scss index 9edbaa42..14d341cb 100644 --- a/babyblotter/static_src/scss/_global.scss +++ b/babybuddy/static_src/scss/_global.scss @@ -1,4 +1,4 @@ -// Baby Blotter site-wide custom styles. +// Baby Buddy site-wide custom styles. // Temporary workaround. See: https://github.com/twbs/bootstrap/issues/23553 .dropdown-menu-right { diff --git a/babyblotter/static_src/scss/_mixins.scss b/babybuddy/static_src/scss/_mixins.scss similarity index 57% rename from babyblotter/static_src/scss/_mixins.scss rename to babybuddy/static_src/scss/_mixins.scss index 2d5e7921..b0d9583b 100644 --- a/babyblotter/static_src/scss/_mixins.scss +++ b/babybuddy/static_src/scss/_mixins.scss @@ -1,3 +1,3 @@ @import '../../../node_modules/bootstrap/scss/mixins'; -// Baby Blotter site-wide custom mixins. +// Baby Buddy site-wide custom mixins. diff --git a/babyblotter/static_src/scss/_variables.scss b/babybuddy/static_src/scss/_variables.scss similarity index 74% rename from babyblotter/static_src/scss/_variables.scss rename to babybuddy/static_src/scss/_variables.scss index 93bdb9c5..7d8f080a 100644 --- a/babyblotter/static_src/scss/_variables.scss +++ b/babybuddy/static_src/scss/_variables.scss @@ -2,4 +2,4 @@ @import '../../../node_modules/bootstrap/scss/variables'; @import 'themes/blueorange'; -// Baby Blotter site-wide variables. +// Baby Buddy site-wide variables. diff --git a/babyblotter/static_src/scss/babyblotter.scss b/babybuddy/static_src/scss/babybuddy.scss similarity index 100% rename from babyblotter/static_src/scss/babyblotter.scss rename to babybuddy/static_src/scss/babybuddy.scss diff --git a/babyblotter/static_src/scss/themes/blueorange.scss b/babybuddy/static_src/scss/themes/blueorange.scss similarity index 100% rename from babyblotter/static_src/scss/themes/blueorange.scss rename to babybuddy/static_src/scss/themes/blueorange.scss diff --git a/babybuddy/templates/admin/base_site.html b/babybuddy/templates/admin/base_site.html new file mode 100644 index 00000000..a8b2c7d6 --- /dev/null +++ b/babybuddy/templates/admin/base_site.html @@ -0,0 +1,9 @@ +{% extends "admin/base.html" %} + +{% block title %}{{ title }} | Baby Buddy Admin{% endblock %} + +{% block branding %} +

Baby Buddy Admin

+{% endblock %} + +{% block nav-global %}{% endblock %} diff --git a/babyblotter/templates/babyblotter/base.html b/babybuddy/templates/babybuddy/base.html similarity index 50% rename from babyblotter/templates/babyblotter/base.html rename to babybuddy/templates/babybuddy/base.html index 028ecb00..aa5a77c9 100644 --- a/babyblotter/templates/babyblotter/base.html +++ b/babybuddy/templates/babybuddy/base.html @@ -6,13 +6,13 @@ - {% block title %}{% endblock %} | Baby Blotter + {% block title %}{% endblock %} | Baby Buddy {% if debug %} - - + + {% else %} - - + + {% endif %} @@ -31,11 +31,11 @@ {% block page %}{% endblock %} {% if debug %} - - + + {% else %} - - + + {% endif %} {% block javascript %}{% endblock %} diff --git a/babyblotter/templates/babyblotter/form.html b/babybuddy/templates/babybuddy/form.html similarity index 100% rename from babyblotter/templates/babyblotter/form.html rename to babybuddy/templates/babybuddy/form.html diff --git a/babyblotter/templates/babyblotter/nav-dropdown.html b/babybuddy/templates/babybuddy/nav-dropdown.html similarity index 99% rename from babyblotter/templates/babyblotter/nav-dropdown.html rename to babybuddy/templates/babybuddy/nav-dropdown.html index 97b8d780..eb8aa97b 100644 --- a/babyblotter/templates/babyblotter/nav-dropdown.html +++ b/babybuddy/templates/babybuddy/nav-dropdown.html @@ -1,9 +1,9 @@ -{% extends 'babyblotter/base.html' %} +{% extends 'babybuddy/base.html' %} {% load timers %} {% block nav %}