animal photos can now be added

sayard · Jun 12, 2017 · 0a356fa · 0a356fa
1 parent 9ea57fb
commit 0a356fa
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/animal_shelter/animal_list/models.py b/animal_shelter/animal_list/models.py
@@ -35,6 +35,7 @@ class Animal(models.Model):
     description.null = False
     age = models.PositiveSmallIntegerField()
     is_visible = models.BooleanField(default=True)
+    thumbnail = models.FileField(upload_to='documents/%Y/%m/%d', default=None, blank=True, null=True)
 
     def clean(self):
         validate_available_places(self)

diff --git a/animal_shelter/animal_list/templates/animal_list/details.html b/animal_shelter/animal_list/templates/animal_list/details.html
@@ -11,6 +11,7 @@
 {% endblock %}
 {% block content %}
     {% if animal.is_visible %}
+        <img class="img-thumbnail" src="{{ animal.thumbnail.url }}" alt="{{ animal.name }}">
         <h2>{{ animal.name }}</a></h2><br />
         <h3>Species: {{ animal.specie }} | Color: {{ animal.color }} | Age: {{ animal.age }}</h3>
         <p>{{ animal.description }}</p>

diff --git a/animal_shelter/animal_list/templates/animal_list/list.html b/animal_shelter/animal_list/templates/animal_list/list.html
@@ -12,8 +12,13 @@
 {% block content %}
     {% for animal in object_list %}
         {% if animal.is_visible%}
-            <h3><a href="/animals/{{ animal.id }}">{{ animal.name }} </a></h3>
-            <h4>Species: {{ animal.species }} | Color: {{ animal.color }}</h4>
+            <div class="row">
+                <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">
+                    <a href="/animals/{{ animal.id }}"><img class="img-thumbnail" src="{{ animal.thumbnail.url }}" alt="{{ animal.name }}"></a>
+                </div>
+                <h3><a href="/animals/{{ animal.id }}">{{ animal.name }} </a></h3>
+                <h4>Species: {{ animal.species }} | Color: {{ animal.color }}</h4>
+            </div>
         {% endif %}
     {% endfor %}
 {% endblock %}
diff --git a/animal_shelter/animal_shelter/settings.py b/animal_shelter/animal_shelter/settings.py
@@ -122,8 +122,15 @@
 
 STATIC_URL = '/static/'
 
+# Settings for email sending
+
 EMAIL_USE_TLS = True
 EMAIL_HOST = email_host
 EMAIL_HOST_USER = email_user
 EMAIL_HOST_PASSWORD = email_pw
-EMAIL_PORT = 587
+EMAIL_PORT = 587
+
+# Media storage settings
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_URL = '/media/'
diff --git a/animal_shelter/animal_shelter/urls.py b/animal_shelter/animal_shelter/urls.py
@@ -13,8 +13,10 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
+from django.conf import settings
 from django.conf.urls import url, include
 from django.contrib import admin
+from django.conf.urls.static import static
 
 admin.autodiscover()
 
@@ -25,4 +27,4 @@
     url(r'^login/', include('home_page.urls')),
     url(r'^logout/', include('home_page.urls')),
     url(r'^register/', include('home_page.urls')),
-]
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/animal_shelter/db.sqlite3 b/animal_shelter/db.sqlite3