update

sidtSite/sidtSite/settings.py → GeoInt_SIDT/settings.py

 """
-Django settings for sidtSite project.
+Django settings for GeoInt_SIDT project.
 
-Generated by 'django-admin startproject' using Django 1.10.7.
+Generated by 'django-admin startproject' using Django 1.11.3.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.10/topics/settings/
+https://docs.djangoproject.com/en/1.11/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.10/ref/settings/
+https://docs.djangoproject.com/en/1.11/ref/settings/
 """
 
 import os
@@ -17,10 +17,10 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'qjjavim520di7=h&!lb4n+j1%7u!ji0k!j#1-+cfh)$nkq80)r'
+SECRET_KEY = 'y$aar46avbx((5u&r*l77)x9-)s$y4nj$3sp707-n%=feq+h0p'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -37,8 +37,6 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'catalog.apps.CatalogConfig', #Catalog app 
-
 ]
 
 MIDDLEWARE = [
@@ -51,7 +49,7 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'sidtSite.urls'
+ROOT_URLCONF = 'GeoInt_SIDT.urls'
 
 TEMPLATES = [
     {
@@ -69,11 +67,11 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'sidtSite.wsgi.application'
+WSGI_APPLICATION = 'GeoInt_SIDT.wsgi.application'
 
 
 # Database
-# https://docs.djangoproject.com/en/1.10/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -84,7 +82,7 @@ DATABASES = {
 
 
 # Password validation
-# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -103,7 +101,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.10/topics/i18n/
+# https://docs.djangoproject.com/en/1.11/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -117,6 +115,6 @@ USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.10/howto/static-files/
+# https://docs.djangoproject.com/en/1.11/howto/static-files/
 
 STATIC_URL = '/static/'

sidtSite/sidtSite/urls.py → GeoInt_SIDT/urls.py

-"""sidtSite URL Configuration
+"""GeoInt_SIDT URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/1.10/topics/http/urls/
+    https://docs.djangoproject.com/en/1.11/topics/http/urls/
 Examples:
 Function views
     1. Add an import:  from my_app import views
@@ -15,14 +15,7 @@ Including another URLconf
 """
 from django.conf.urls import url
 from django.contrib import admin
-from django.conf.urls import include
-from django.views.generic import RedirectView
-from django.conf import settings
-from django.conf.urls.static import static
-# Use static() to add url mapping to serve static files during development (only)
 
 urlpatterns = [
-	url(r'^admin/', admin.site.urls),
-	url(r'^catalog/', include('catalog.urls')),
-	url(r'^$', RedirectView.as_view(url='/catalog/', permanent=True)),
-]+ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+    url(r'^admin/', admin.site.urls),
+]

sidtSite/sidtSite/wsgi.py → GeoInt_SIDT/wsgi.py

 """
-WSGI config for sidtSite project.
+WSGI config for GeoInt_SIDT 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.10/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
 """
 
 import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sidtSite.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "GeoInt_SIDT.settings")
 
 application = get_wsgi_application()

sidtSite/manage.py → manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sidtSite.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "GeoInt_SIDT.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError:

sidtSite/admin.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.contrib import admin
+
+# Register your models here.

sidtSite/apps.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class SidtsiteConfig(AppConfig):
+    name = 'sidtSite'

sidtSite/catalog/admin.py

-from django.contrib import admin
-
-# Register your models here.
-
-from .models import Author, Genre, Book, BookInstance, Language
-
-
-# Define the admin class
-class AuthorAdmin(admin.ModelAdmin):
-	list_display = ('last_name', 'first_name', 'date_of_birth', 'date_of_death')
-	fields = ['first_name', 'last_name', ('date_of_birth', 'date_of_death')]
-
-
-# Register the admin class with the associated model
-admin.site.register(Author, AuthorAdmin)
-admin.site.register(Genre)
-
-#admin.site.register(Book)
-#admin.site.register(BookInstance)
-# Register the Admin classes for Book using the decorator
-
-class BooksInstanceInline(admin.TabularInline):
-	model = BookInstance
-	extra = 0
-
-@admin.register(Book)
-class BookAdmin(admin.ModelAdmin):
-	list_display = ('title', 'author', 'display_genre')
-	inlines = [BooksInstanceInline]
-
-
-# Register the Admin classes for BookInstance using the decorator
-
-@admin.register(BookInstance) 
-class BookInstanceAdmin(admin.ModelAdmin):
-	list_filter = ('status', 'due_back')
-	fieldsets = (
-		(None, {
-		    'fields': ('book','imprint', 'id')
-		}),
-		('Availability', {
-		    'fields': ('status', 'due_back')
-		}),
-	)
-
-admin.site.register(Language)

sidtSite/catalog/apps.py

-from django.apps import AppConfig
-
-
-class CatalogConfig(AppConfig):
-    name = 'catalog'

sidtSite/catalog/migrations/0001_initial.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2017-05-04 22:41
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Author',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('first_name', models.CharField(max_length=100)),
-                ('last_name', models.CharField(max_length=100)),
-                ('date_of_birth', models.DateField(blank=True, null=True)),
-                ('date_of_death', models.DateField(blank=True, null=True, verbose_name='Died')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Book',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=200)),
-                ('summary', models.TextField(help_text='Enter a brief description of the book', max_length=1000)),
-                ('isbn', models.CharField(help_text='13 Character <a href="https://www.isbn-international.org/content/what-isbn">ISBN number</a>', max_length=13, verbose_name='ISBN')),
-                ('author', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='catalog.Author')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='BookInstance',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, help_text='Unique ID for this particular book across whole library', primary_key=True, serialize=False)),
-                ('imprint', models.CharField(max_length=200)),
-                ('due_back', models.DateField(blank=True, null=True)),
-                ('status', models.CharField(blank=True, choices=[('d', 'Maintenance'), ('o', 'On loan'), ('a', 'Available'), ('r', 'Reserved')], default='d', help_text='Book availability', max_length=1)),
-                ('book', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='catalog.Book')),
-            ],
-            options={
-                'ordering': ['due_back'],
-            },
-        ),
-        migrations.CreateModel(
-            name='Genre',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='Enter a book genre (e.g. Science Fiction, French Poetry etc.)', max_length=200)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='book',
-            name='genre',
-            field=models.ManyToManyField(help_text='Select a genre for this book', to='catalog.Genre'),
-        ),
-    ]

sidtSite/catalog/migrations/0002_auto_20170524_2012.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2017-05-24 20:12
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('catalog', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Language',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text="Enter a the book's natural language (e.g. English, French, Japanese etc.)", max_length=200)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='book',
-            name='language',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='catalog.Language'),
-        ),
-    ]

sidtSite/catalog/models.py

-from django.db import models
-from django.urls import reverse #Used to generate URLs by reversing the URL patterns
-import uuid # Required for unique book instances
-
-# Create your models here.
-
-class Genre(models.Model):
-	"""
-	Model representing a book genre (e.g. Science Fiction, Non Fiction).
-	"""
-	name = models.CharField(max_length=200, help_text="Enter a book genre (e.g. Science Fiction, French Poetry etc.)")
-    
-	def __str__(self):
-		"""
-		String for representing the Model object (in Admin site etc.)
-		"""
-		return self.name
-
-#===============================================================================
-class Book(models.Model):
-	"""
-	Model representing a book (but not a specific copy of a book).
-	"""
-	title = models.CharField(max_length=200)
-	author = models.ForeignKey('Author', on_delete=models.SET_NULL, null=True)
-	# Foreign Key used because book can only have one author, but authors can have multiple books
-	# Author as a string rather than object because it hasn't been declared yet in the file.
-	summary = models.TextField(max_length=1000, help_text="Enter a brief description of the book")
-	isbn = models.CharField('ISBN',max_length=13, help_text='13 Character <a href="https://www.isbn-international.org/content/what-isbn">ISBN number</a>')
-	genre = models.ManyToManyField(Genre, help_text="Select a genre for this book")
-	# ManyToManyField used because genre can contain many books. Books can cover many genres.
-	# Genre class has already been defined so we can specify the object above.
-	language = models.ForeignKey('Language', on_delete=models.SET_NULL, null=True)
-
-	def __str__(self):
-		"""
-		String for representing the Model object.
-		"""
-		return self.title
-
-
-	def get_absolute_url(self):
-		"""
-		Returns the url to access a particular book instance.
-		"""
-		return reverse('book-detail', args=[str(self.id)])
-
-	def display_genre(self):
-		"""
-		Creates a string for the Genre. This is required to display genre in Admin.
-		"""
-		return ', '.join([ genre.name for genre in self.genre.all()[:3] ])
-
-	display_genre.short_description = 'Genre'
-
-#===============================================================================
-class BookInstance(models.Model):
-	"""
-	Model representing a specific copy of a book (i.e. that can be borrowed from the library).
-	"""
-	id = models.UUIDField(primary_key=True, default=uuid.uuid4, help_text="Unique ID for this particular book across whole library")
-	book = models.ForeignKey('Book', on_delete=models.SET_NULL, null=True) 
-	imprint = models.CharField(max_length=200)
-	due_back = models.DateField(null=True, blank=True)
-
-	LOAN_STATUS = (
-	('d', 'Maintenance'),
-	('o', 'On loan'),
-	('a', 'Available'),
-	('r', 'Reserved'),
-	)
-
-	status = models.CharField(max_length=1, choices=LOAN_STATUS, blank=True, default='d', help_text='Book availability')
-
-	class Meta:
-		ordering = ["due_back"]
-
-
-	def __str__(self):
-		"""
-		String for representing the Model object
-		"""
-		return '%s (%s)' % (self.id,self.book.title)
-
-#===============================================================================
-class Author(models.Model):
-	"""
-	Model representing an author.
-	"""
-	first_name = models.CharField(max_length=100)
-	last_name = models.CharField(max_length=100)
-	date_of_birth = models.DateField(null=True, blank=True)
-	date_of_death = models.DateField('Died', null=True, blank=True)
-
-	def get_absolute_url(self):
-		"""
-		Returns the url to access a particular author instance.
-		"""
-		return reverse('author-detail', args=[str(self.id)])
-
-
-	def __str__(self):
-		"""
-		String for representing the Model object.
-		"""
-		return '%s, %s' % (self.last_name, self.first_name)
-#===============================================================================
-class Language(models.Model):
-	"""
-	Model representing a Language (e.g. English, French, Japanese, etc.)
-	"""
-	name = models.CharField(max_length=200, help_text="Enter a the book's natural language (e.g. English, French, Japanese etc.)")
-
-	def __str__(self):
-		"""
-		String for representing the Model object (in Admin site etc.)
-		"""
-		return self.name
-

sidtSite/catalog/static/css/styles.css

-.sidebar-nav {
-    margin-top: 20px;
-    padding: 0;
-    list-style: none;
-}

sidtSite/catalog/templates/base_generic.html

-<!DOCTYPE html>
-<html lang="en">
-<head>
-  
-  {% block title %}<title>Local Library</title>{% endblock %}
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-  
-  <!-- Add additional CSS in static file -->
-  {% load static %}
-  <link rel="stylesheet" href="{% static 'css/styles.css' %}">
-</head>
-
-<body>
-
-  <div class="container-fluid">
-
-    <div class="row">
-      <div class="col-sm-2">
-      {% block sidebar %}
-      <ul class="sidebar-nav">
-          <li><a href="{% url 'index' %}">Home</a></li>
-          <li><a href="{% url 'books' %}">All books</a></li>
-          <li><a href="{% url 'authors' %}">All authors</a></li>
-      </ul>
-     {% endblock %}
-      </div>
-      <div class="col-sm-10 ">
-	{% block content %}{% endblock %}
-  
-	{% block pagination %}
-	  {% if is_paginated %}
-	      <div class="pagination">
-		  <span class="page-links">
-		      {% if page_obj.has_previous %}
-		          <a href="{{ request.path }}?page={{ page_obj.previous_page_number }}">previous</a>
-		      {% endif %}
-		      <span class="page-current">
-		          Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
-		      </span>
-		      {% if page_obj.has_next %}
-		          <a href="{{ request.path }}?page={{ page_obj.next_page_number }}">next</a>
-		      {% endif %}
-		  </span>
-	      </div>
-	  {% endif %}
-	{% endblock %}
-      </div>
-    </div>
-
-  </div>
-</body>
-</html>

sidtSite/catalog/templates/catalog/author_detail.html

-{% extends "base_generic.html" %}
-
-{% block content %}
-  <h1>Author: {{ author.first_name}} {{ author.last_name}}</h1>
-
-
-
-  <div style="margin-left:20px;margin-top:20px">
-    <h4>Books</h4>
-
-    {% for book in author.book_set.all %}
-    <hr>
-
-    <p><strong>Imprint:</strong> {{book.title}}</p>
-
-    {% endfor %}
-  </div>
-{% endblock %}

sidtSite/catalog/templates/catalog/author_list.html

-{% extends "base_generic.html" %}
-
-{% block content %}
-    <h1>Author List</h1>
-
-    {% if author_list %}
-    <ul>
-
-      {% for author in author_list %}
-      <li>
-        <a href="{{ author.get_absolute_url }}">{{ author.first_name}} {{author.last_name}}</a> ({{author.date_of_birth}}-{{author.date_of_death}})
-      </li>
-      {% endfor %}
-
-    </ul>
-    {% else %}
-      <p>There are no books in the library.</p>
-    {% endif %}       
-{% endblock %}

sidtSite/catalog/templates/catalog/book_detail.html

-{% extends "base_generic.html" %}
-
-{% block content %}
-  <h1>Title: {{ book.title }}</h1>
-
-  <p><strong>Author:</strong> <a href="">{{ book.author }}</a></p> <!-- author detail link not yet defined -->
-  <p><strong>Summary:</strong> {{ book.summary }}</p>
-  <p><strong>ISBN:</strong> {{ book.isbn }}</p> 
-  <p><strong>Language:</strong> {{ book.language }}</p>  
-  <p><strong>Genre:</strong> {% for genre in book.genre.all %} {{ genre }}{% if not forloop.last %}, {% endif %}{% endfor %}</p>  
-
-  <div style="margin-left:20px;margin-top:20px">
-    <h4>Copies</h4>
-
-    {% for copy in book.bookinstance_set.all %}
-    <hr>
-    <p class="{% if copy.status == 'a' %}text-success{% elif copy.status == 'd' %}text-danger{% else %}text-warning{% endif %}">{{ copy.get_status_display }}</p>
-    {% if copy.status != 'a' %}<p><strong>Due to be returned:</strong> {{copy.due_back}}</p>{% endif %}
-    <p><strong>Imprint:</strong> {{copy.imprint}}</p>
-    <p class="text-muted"><strong>Id:</strong> {{copy.id}}</p>
-    {% endfor %}
-  </div>
-{% endblock %}

sidtSite/catalog/templates/catalog/book_list.html

-{% extends "base_generic.html" %}
-
-{% block content %}
-    <h1>Book List</h1>
-
-    {% if book_list %}
-    <ul>
-
-      {% for book in book_list %}
-      <li>
-        <a href="{{ book.get_absolute_url }}">{{ book.title }}</a> ({{book.author}})
-      </li>
-      {% endfor %}
-
-    </ul>
-    {% else %}
-      <p>There are no books in the library.</p>
-    {% endif %}       
-{% endblock %}

sidtSite/catalog/templates/index.html

-{% extends "base_generic.html" %}
-
-{% block content %}
-<h1>Local Library Home</h1>
-
-  <p>Welcome to <em>LocalLibrary</em>, a very basic Django website developed as a tutorial example on the Mozilla Developer Network.</p>
-
-<h2>Dynamic content</h2>
-
-  <p>The library has the following record counts:</p>
-  <ul>
-    <li><strong>Books:</strong> {{ num_books }}</li>
-    <li><strong>Copies:</strong> {{ num_instances }}</li>
-    <li><strong>Copies available:</strong> {{ num_instances_available }}</li>
-    <li><strong>Authors:</strong> {{ num_authors }}</li>
-  </ul>
-
-{% endblock %}

sidtSite/catalog/urls.py

-from django.conf.urls import url
-
-from . import views
-
-
-urlpatterns = [
-	url(r'^$', views.index, name='index'),
-	url(r'^books/$', views.BookListView.as_view(), name='books'),
-	url(r'^authors/$', views.AuthorListView.as_view(), name='authors'),
-	url(r'^book/(?P<pk>\d+)$', views.BookDetailView.as_view(), name='book-detail'),
-	url(r'^authors/(?P<pk>\d+)$', views.AuthorDetailView.as_view(), name='author-detail'),
-]

sidtSite/catalog/views.py

-from django.shortcuts import render
-from django.views import generic
-# Create your views here.
-
-from .models import Book, Author, BookInstance, Genre
-
-def index(request):
-    """
-    View function for home page of site.
-    """
-    # Generate counts of some of the main objects
-    num_books=Book.objects.all().count()
-    num_instances=BookInstance.objects.all().count()
-    # Available books (status = 'a')
-    num_instances_available=BookInstance.objects.filter(status__exact='a').count()
-    num_authors=Author.objects.count()  # The 'all()' is implied by default.
-    
-    # Number of visits to this view, as counted in the session variable.
-    num_visits=request.session.get('num_visits', 0)
-    request.session['num_visits'] = num_visits+1
-
-    # Render the HTML template index.html with the data in the context variable
-    return render(
-        request,
-        'index.html',
-        context={'num_books':num_books,'num_instances':num_instances,'num_instances_available':num_instances_available,'num_authors':num_authors, 'num_visits':num_visits},
-    )
-
-
-
-class BookListView(generic.ListView):
-    model = Book
-    paginate_by = 10
-
-
-class BookDetailView(generic.DetailView):
-    model = Book
-
-
-class AuthorListView(generic.ListView):
-    model = Author
-    paginate_by = 10
-
-class AuthorDetailView(generic.DetailView):
-    model = Author

sidtSite/models.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.

sidtSite/catalog/tests.py → sidtSite/tests.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 from django.test import TestCase
 
 # Create your tests here.

sidtSite/views.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.shortcuts import render
+
+# Create your views here.