Merge branch 'bookshelf_app'

diannedelpilar_reading/bookshelf/models.py

 from django.db import models
+from django.utils import timezone
 
-# Create your models here.
+class Author(models.Model):
+    first_name = models.CharField(max_length=50)
+    last_name = models.CharField(max_length=50)
+    age = models.IntegerField(default = 0)
+    nationality = models.CharField(max_length=100)
+    bio = models.TextField(max_length=700)
+
+    def __str__(self):
+        return self.first_name, self.last_name
+
+
+class Books(models.Model):
+    title = models.CharField(max_length=300)
+    author = models.ForeignKey(Author, on_delete = models.CASCADE)
+    publisher = models.CharField(max_length=100)
+    year_published = models.DateTimeField(default=timezone.now, null=True, blank=True)
+    ISBN = models.IntegerField(default = 0000000000000)
+    blurb = models.TextField(max_length=200)
+
+    def __str__(self):
+        return self.title
\ No newline at end of file

diannedelpilar_reading/bookshelf/urls.py

+from django.urls import path
+
+from .views import index
+
+urlpatterns = [
+    path('', index, name='index'),
+]
+
+app_name = 'bookshelf' 
\ No newline at end of file