From 5dc52e776a2112a78580b6800cdcc9c6f89cea88 Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Mon, 8 Sep 2014 00:18:17 -0700 Subject: [PATCH 1/8] setup virtual env requirements, initial project & app setup, and split out settings. SECRET_KEY is stored in a local environment variable --- bockus/bockus/__init__.py | 0 bockus/bockus/settings/base.py | 82 +++++++++++++++++++++++++++++++++ bockus/bockus/settings/local.py | 24 ++++++++++ bockus/bockus/urls.py | 12 +++++ bockus/bockus/wsgi.py | 14 ++++++ bockus/bookcases/__init__.py | 0 bockus/bookcases/admin.py | 3 ++ bockus/bookcases/models.py | 3 ++ bockus/bookcases/tests.py | 3 ++ bockus/bookcases/views.py | 3 ++ bockus/books/__init__.py | 0 bockus/books/admin.py | 3 ++ bockus/books/models.py | 3 ++ bockus/books/tests.py | 3 ++ bockus/books/views.py | 3 ++ bockus/manage.py | 10 ++++ bockus/shelves/__init__.py | 0 bockus/shelves/admin.py | 3 ++ bockus/shelves/models.py | 3 ++ bockus/shelves/tests.py | 3 ++ bockus/shelves/views.py | 3 ++ requirements.txt | 2 + 22 files changed, 180 insertions(+) create mode 100644 bockus/bockus/__init__.py create mode 100644 bockus/bockus/settings/base.py create mode 100644 bockus/bockus/settings/local.py create mode 100644 bockus/bockus/urls.py create mode 100644 bockus/bockus/wsgi.py create mode 100644 bockus/bookcases/__init__.py create mode 100644 bockus/bookcases/admin.py create mode 100644 bockus/bookcases/models.py create mode 100644 bockus/bookcases/tests.py create mode 100644 bockus/bookcases/views.py create mode 100644 bockus/books/__init__.py create mode 100644 bockus/books/admin.py create mode 100644 bockus/books/models.py create mode 100644 bockus/books/tests.py create mode 100644 bockus/books/views.py create mode 100755 bockus/manage.py create mode 100644 bockus/shelves/__init__.py create mode 100644 bockus/shelves/admin.py create mode 100644 bockus/shelves/models.py create mode 100644 bockus/shelves/tests.py create mode 100644 bockus/shelves/views.py create mode 100644 requirements.txt diff --git a/bockus/bockus/__init__.py b/bockus/bockus/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bockus/bockus/settings/base.py b/bockus/bockus/settings/base.py new file mode 100644 index 0000000..b989e51 --- /dev/null +++ b/bockus/bockus/settings/base.py @@ -0,0 +1,82 @@ +""" +Django settings for bockus project. + +For more information on this file, see +https://docs.djangoproject.com/en/1.6/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.6/ref/settings/ +""" + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +import os +BASE_DIR = os.path.dirname(os.path.dirname(__file__)) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = "abc123" + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +TEMPLATE_DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = ( + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +) + +MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +) + +ROOT_URLCONF = 'bockus.urls' + +WSGI_APPLICATION = 'bockus.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.6/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + +# Internationalization +# https://docs.djangoproject.com/en/1.6/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.6/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/bockus/bockus/settings/local.py b/bockus/bockus/settings/local.py new file mode 100644 index 0000000..c3c27aa --- /dev/null +++ b/bockus/bockus/settings/local.py @@ -0,0 +1,24 @@ +import os + +from .base import * + +SECRET_KEY = os.environ["SECRET_KEY"] + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + +DATABASES = { + "default": { + "ENGINE": "django.db.backends.postgresql_psycopg2", + "NAME": "bcokus", + "USER": "", + "PASSWORD": "", + "HOST": "localhost", + "PORT": "", + + } +} + +INSTALLED_APPS += ("debug_toolbar",) \ No newline at end of file diff --git a/bockus/bockus/urls.py b/bockus/bockus/urls.py new file mode 100644 index 0000000..5f9db04 --- /dev/null +++ b/bockus/bockus/urls.py @@ -0,0 +1,12 @@ +from django.conf.urls import patterns, include, url + +from django.contrib import admin +admin.autodiscover() + +urlpatterns = patterns('', + # Examples: + # url(r'^$', 'bockus.views.home', name='home'), + # url(r'^blog/', include('blog.urls')), + + url(r'^admin/', include(admin.site.urls)), +) diff --git a/bockus/bockus/wsgi.py b/bockus/bockus/wsgi.py new file mode 100644 index 0000000..58ffd6e --- /dev/null +++ b/bockus/bockus/wsgi.py @@ -0,0 +1,14 @@ +""" +WSGI config for bockus project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/ +""" + +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bockus.settings") + +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() diff --git a/bockus/bookcases/__init__.py b/bockus/bookcases/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bockus/bookcases/admin.py b/bockus/bookcases/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/bockus/bookcases/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/bockus/bookcases/models.py b/bockus/bookcases/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/bockus/bookcases/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/bockus/bookcases/tests.py b/bockus/bookcases/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/bockus/bookcases/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/bockus/bookcases/views.py b/bockus/bookcases/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/bockus/bookcases/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/bockus/books/__init__.py b/bockus/books/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bockus/books/admin.py b/bockus/books/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/bockus/books/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/bockus/books/models.py b/bockus/books/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/bockus/books/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/bockus/books/tests.py b/bockus/books/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/bockus/books/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/bockus/books/views.py b/bockus/books/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/bockus/books/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/bockus/manage.py b/bockus/manage.py new file mode 100755 index 0000000..0a4ccea --- /dev/null +++ b/bockus/manage.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bockus.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/bockus/shelves/__init__.py b/bockus/shelves/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bockus/shelves/admin.py b/bockus/shelves/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/bockus/shelves/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/bockus/shelves/models.py b/bockus/shelves/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/bockus/shelves/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/bockus/shelves/tests.py b/bockus/shelves/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/bockus/shelves/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/bockus/shelves/views.py b/bockus/shelves/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/bockus/shelves/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..b556b18 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +Django==1.6.5 +wsgiref==0.1.2 From f025fd6dc0cd1eac627d44662e47ea3ff319829f Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Wed, 10 Sep 2014 00:35:52 -0700 Subject: [PATCH 2/8] fixed spacing (removed tabs) and corrected db name spelling error --- bockus/bockus/settings/local.py | 17 ++++++++--------- bockus/bookcases/__init__.py | 0 bockus/bookcases/admin.py | 3 --- bockus/bookcases/models.py | 3 --- bockus/bookcases/tests.py | 3 --- bockus/bookcases/views.py | 3 --- bockus/shelves/__init__.py | 0 bockus/shelves/admin.py | 3 --- bockus/shelves/models.py | 3 --- bockus/shelves/tests.py | 3 --- bockus/shelves/views.py | 3 --- 11 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 bockus/bookcases/__init__.py delete mode 100644 bockus/bookcases/admin.py delete mode 100644 bockus/bookcases/models.py delete mode 100644 bockus/bookcases/tests.py delete mode 100644 bockus/bookcases/views.py delete mode 100644 bockus/shelves/__init__.py delete mode 100644 bockus/shelves/admin.py delete mode 100644 bockus/shelves/models.py delete mode 100644 bockus/shelves/tests.py delete mode 100644 bockus/shelves/views.py diff --git a/bockus/bockus/settings/local.py b/bockus/bockus/settings/local.py index c3c27aa..795302c 100644 --- a/bockus/bockus/settings/local.py +++ b/bockus/bockus/settings/local.py @@ -10,15 +10,14 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' DATABASES = { - "default": { - "ENGINE": "django.db.backends.postgresql_psycopg2", - "NAME": "bcokus", - "USER": "", - "PASSWORD": "", - "HOST": "localhost", - "PORT": "", - - } + "default": { + "ENGINE": "django.db.backends.postgresql_psycopg2", + "NAME": "bockus", + "USER": "", + "PASSWORD": "", + "HOST": "localhost", + "PORT": "", + } } INSTALLED_APPS += ("debug_toolbar",) \ No newline at end of file diff --git a/bockus/bookcases/__init__.py b/bockus/bookcases/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/bockus/bookcases/admin.py b/bockus/bookcases/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/bockus/bookcases/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/bockus/bookcases/models.py b/bockus/bookcases/models.py deleted file mode 100644 index 71a8362..0000000 --- a/bockus/bookcases/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/bockus/bookcases/tests.py b/bockus/bookcases/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/bockus/bookcases/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/bockus/bookcases/views.py b/bockus/bookcases/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/bockus/bookcases/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/bockus/shelves/__init__.py b/bockus/shelves/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/bockus/shelves/admin.py b/bockus/shelves/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/bockus/shelves/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/bockus/shelves/models.py b/bockus/shelves/models.py deleted file mode 100644 index 71a8362..0000000 --- a/bockus/shelves/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/bockus/shelves/tests.py b/bockus/shelves/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/bockus/shelves/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/bockus/shelves/views.py b/bockus/shelves/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/bockus/shelves/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. From 5d88d60cd25d3e36069fe7c46808ed5aee2be987 Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Sat, 13 Sep 2014 00:14:46 -0700 Subject: [PATCH 3/8] updating settings to include the new apps being added --- bockus/bockus/settings/__init__.py | 1 + bockus/bockus/settings/base.py | 3 +++ bockus/bockus/settings/local.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 bockus/bockus/settings/__init__.py diff --git a/bockus/bockus/settings/__init__.py b/bockus/bockus/settings/__init__.py new file mode 100644 index 0000000..a54cfb5 --- /dev/null +++ b/bockus/bockus/settings/__init__.py @@ -0,0 +1 @@ +__author__ = 'kelseyhawley' diff --git a/bockus/bockus/settings/base.py b/bockus/bockus/settings/base.py index b989e51..cd46c7d 100644 --- a/bockus/bockus/settings/base.py +++ b/bockus/bockus/settings/base.py @@ -36,6 +36,9 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'books', + 'profiles', + 'usercollections', ) MIDDLEWARE_CLASSES = ( diff --git a/bockus/bockus/settings/local.py b/bockus/bockus/settings/local.py index 795302c..2dbd789 100644 --- a/bockus/bockus/settings/local.py +++ b/bockus/bockus/settings/local.py @@ -1,6 +1,6 @@ import os -from .base import * +from base import * SECRET_KEY = os.environ["SECRET_KEY"] From 966ca98ec4665b7c4d171b85c3ff920fe3140d85 Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Sat, 13 Sep 2014 00:16:12 -0700 Subject: [PATCH 4/8] adding models to books, some testing already to confirm working --- bockus/books/models.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/bockus/books/models.py b/bockus/books/models.py index 71a8362..2c55334 100644 --- a/bockus/books/models.py +++ b/bockus/books/models.py @@ -1,3 +1,31 @@ from django.db import models # Create your models here. + +COVER_TYPE_CHOICES = ( + ("Front", "Front"), + ("Spine", "Spine"), + ("Back", "Back"), + ("Full", "Full - Front, Spine & Back"), +) + +class Book(models.Model): + title = models.CharField(max_length=50) + author_first_name = models.CharField(max_length=25) + author_last_name = models.CharField(max_length=25) + summary = models.TextField() + + def __str__(self): + return self.title + " by " + self.author_last_name + ", " + self.author_first_name + +class Cover(models.Model): + book = models.ForeignKey(Book) + publisher = models.CharField(max_length=25) + publish_date = models.DateField() + # image = models.ImageField(upload_to="book_covers") + type = models.CharField(max_length=10, choices=COVER_TYPE_CHOICES) + + def __str__(self): + return self.type + " - "+ self.book.title + " by " + \ + self.book.author_last_name + ", " + self.book.author_first_name + From 5e52c46e7c687e372415841014d4dd8b007e5666 Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Sat, 13 Sep 2014 00:16:50 -0700 Subject: [PATCH 5/8] initial creation of profiles & usercollections apps. models started, but not complete nor tested --- bockus/profiles/__init__.py | 0 bockus/profiles/admin.py | 3 +++ bockus/profiles/models.py | 11 ++++++++++ bockus/profiles/tests.py | 3 +++ bockus/profiles/views.py | 3 +++ bockus/usercollections/__init__.py | 0 bockus/usercollections/admin.py | 3 +++ bockus/usercollections/models.py | 33 ++++++++++++++++++++++++++++++ bockus/usercollections/tests.py | 3 +++ bockus/usercollections/views.py | 3 +++ 10 files changed, 62 insertions(+) create mode 100644 bockus/profiles/__init__.py create mode 100644 bockus/profiles/admin.py create mode 100644 bockus/profiles/models.py create mode 100644 bockus/profiles/tests.py create mode 100644 bockus/profiles/views.py create mode 100644 bockus/usercollections/__init__.py create mode 100644 bockus/usercollections/admin.py create mode 100644 bockus/usercollections/models.py create mode 100644 bockus/usercollections/tests.py create mode 100644 bockus/usercollections/views.py diff --git a/bockus/profiles/__init__.py b/bockus/profiles/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bockus/profiles/admin.py b/bockus/profiles/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/bockus/profiles/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/bockus/profiles/models.py b/bockus/profiles/models.py new file mode 100644 index 0000000..514a3c6 --- /dev/null +++ b/bockus/profiles/models.py @@ -0,0 +1,11 @@ +from django.db import models +from django.contrib.auth.models import User + +# Create your models here. + +class UserProfile(models.Model): + user = models.ForeignKey(User) + username = models.CharField(max_length=25) + first_name = models.CharField(max_length=25) + last_name = models.CharField(max_length=25) + birthdate = models.DateField() \ No newline at end of file diff --git a/bockus/profiles/tests.py b/bockus/profiles/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/bockus/profiles/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/bockus/profiles/views.py b/bockus/profiles/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/bockus/profiles/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/bockus/usercollections/__init__.py b/bockus/usercollections/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bockus/usercollections/admin.py b/bockus/usercollections/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/bockus/usercollections/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/bockus/usercollections/models.py b/bockus/usercollections/models.py new file mode 100644 index 0000000..e9d4347 --- /dev/null +++ b/bockus/usercollections/models.py @@ -0,0 +1,33 @@ +from django.db import models +from django.contrib.auth.models import User + +from books.models import Book, Cover + +# Create your models here. +class UserBook(models.Model): + user = models.ForeignKey(User) + book = models.ForeignKey(Book) + cover = models.ForeignKey(Cover) + rating = models.PositiveSmallIntegerField(max_length=5) + +class Tag(models.Model): + name = models.CharField(max_length=25) + + # create intermediary manytomany table + # https://docs.djangoproject.com/en/dev/topics/db/models/#intermediary-manytomany + books = models.ManyToManyField(UserBook, through="TaggedUserBook") + + # self referencing ManyToMany stack-overflow question + # http://stackoverflow.com/questions/3880489/how-do-i-write-a-django-model-with-manytomany-relationsship-with-self-through-a + groups = models.ManyToManyField('self', through="TagGroup", symmetrical=False) + + +class TaggedUserBook(models.Model): + userBook = models.ForeignKey(UserBook) + tag = models.ForeignKey(Tag) + order_in_tag_list = models.PositiveIntegerField() + +class TagGroup(models.Model): + parent = models.ForeignKey(Tag, related_name='parent') + child = models.ForeignKey(Tag, related_name='child') + order_in_parent_list = models.PositiveIntegerField() \ No newline at end of file diff --git a/bockus/usercollections/tests.py b/bockus/usercollections/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/bockus/usercollections/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/bockus/usercollections/views.py b/bockus/usercollections/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/bockus/usercollections/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. From a5f773b7512d902254f726fad9572cf35d3bf7aa Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Sat, 13 Sep 2014 00:18:37 -0700 Subject: [PATCH 6/8] updated requirements --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index b556b18..985dd29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ Django==1.6.5 +django-debug-toolbar==1.2.1 +psycopg2==2.5.4 +sqlparse==0.1.11 wsgiref==0.1.2 From b8087ba29baa7257528bea16709baab610c76eb6 Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Thu, 25 Sep 2014 20:52:05 -0700 Subject: [PATCH 7/8] upgraded to django 1.7, clean up loose comments & a PEP 8 fix --- bockus/books/models.py | 3 +-- bockus/profiles/models.py | 1 - bockus/usercollections/models.py | 1 - requirements.txt | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bockus/books/models.py b/bockus/books/models.py index 2c55334..75c3dea 100644 --- a/bockus/books/models.py +++ b/bockus/books/models.py @@ -1,6 +1,5 @@ from django.db import models -# Create your models here. COVER_TYPE_CHOICES = ( ("Front", "Front"), @@ -26,6 +25,6 @@ class Cover(models.Model): type = models.CharField(max_length=10, choices=COVER_TYPE_CHOICES) def __str__(self): - return self.type + " - "+ self.book.title + " by " + \ + return self.type + " - " + self.book.title + " by " + \ self.book.author_last_name + ", " + self.book.author_first_name diff --git a/bockus/profiles/models.py b/bockus/profiles/models.py index 514a3c6..eefbb24 100644 --- a/bockus/profiles/models.py +++ b/bockus/profiles/models.py @@ -1,7 +1,6 @@ from django.db import models from django.contrib.auth.models import User -# Create your models here. class UserProfile(models.Model): user = models.ForeignKey(User) diff --git a/bockus/usercollections/models.py b/bockus/usercollections/models.py index e9d4347..f66600d 100644 --- a/bockus/usercollections/models.py +++ b/bockus/usercollections/models.py @@ -3,7 +3,6 @@ from books.models import Book, Cover -# Create your models here. class UserBook(models.Model): user = models.ForeignKey(User) book = models.ForeignKey(Book) diff --git a/requirements.txt b/requirements.txt index 985dd29..27c9043 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.6.5 +Django==1.7 django-debug-toolbar==1.2.1 psycopg2==2.5.4 sqlparse==0.1.11 From 5561e195b75f5e2c239c3d2507e468d5d32b825b Mon Sep 17 00:00:00 2001 From: Kelsey Hawley Date: Thu, 25 Sep 2014 21:15:08 -0700 Subject: [PATCH 8/8] removed profiles app, as currently, no value is added, and most fields are already a part of User. Also updating the book title & author names to allow for more characters. --- bockus/books/models.py | 6 +++--- bockus/profiles/__init__.py | 0 bockus/profiles/admin.py | 3 --- bockus/profiles/models.py | 10 ---------- bockus/profiles/tests.py | 3 --- bockus/profiles/views.py | 3 --- 6 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 bockus/profiles/__init__.py delete mode 100644 bockus/profiles/admin.py delete mode 100644 bockus/profiles/models.py delete mode 100644 bockus/profiles/tests.py delete mode 100644 bockus/profiles/views.py diff --git a/bockus/books/models.py b/bockus/books/models.py index 75c3dea..488728b 100644 --- a/bockus/books/models.py +++ b/bockus/books/models.py @@ -9,9 +9,9 @@ ) class Book(models.Model): - title = models.CharField(max_length=50) - author_first_name = models.CharField(max_length=25) - author_last_name = models.CharField(max_length=25) + title = models.CharField(max_length=255) + author_first_name = models.CharField(max_length=100) + author_last_name = models.CharField(max_length=100) summary = models.TextField() def __str__(self): diff --git a/bockus/profiles/__init__.py b/bockus/profiles/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/bockus/profiles/admin.py b/bockus/profiles/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/bockus/profiles/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/bockus/profiles/models.py b/bockus/profiles/models.py deleted file mode 100644 index eefbb24..0000000 --- a/bockus/profiles/models.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User - - -class UserProfile(models.Model): - user = models.ForeignKey(User) - username = models.CharField(max_length=25) - first_name = models.CharField(max_length=25) - last_name = models.CharField(max_length=25) - birthdate = models.DateField() \ No newline at end of file diff --git a/bockus/profiles/tests.py b/bockus/profiles/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/bockus/profiles/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/bockus/profiles/views.py b/bockus/profiles/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/bockus/profiles/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here.