From 3a4e438f315aed26869997b3f484e32c367a6edb Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Tue, 14 Feb 2017 20:29:45 +0000
Subject: [PATCH] Better image auto fixtures, now has a fixed larger size

---
 .drone.yml                                    |  2 +-
 config/settings/common.py                     |  3 ++-
 config/settings/stage.py                      |  2 +-
 mhackspace/__init__.py                        |  3 ---
 .../management/commands/generate_test_data.py |  7 ++++--
 .../migrations/0002_auto_20170214_1911.py     | 23 +++++++++++++++++++
 mhackspace/base/models.py                     |  2 +-
 .../templates/partials/banner_list.html       |  6 +++--
 8 files changed, 37 insertions(+), 11 deletions(-)
 delete mode 100644 mhackspace/__init__.py
 create mode 100644 mhackspace/base/migrations/0002_auto_20170214_1911.py

diff --git a/.drone.yml b/.drone.yml
index db29b8f..5e078d1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ pipeline:
       - cp -n env.example .env
       - ls -la /drone/src/
       - ls -la /drone/src/requirements/
-      - pip install -r /drone/src/requirements/test.txt
+      - pip install -r ./requirements/test.txt
       - python manage.py test mhackspace --verbosity 2
 
   mailhog:
diff --git a/config/settings/common.py b/config/settings/common.py
index ce8546d..56fd1fb 100644
--- a/config/settings/common.py
+++ b/config/settings/common.py
@@ -299,6 +299,7 @@ SASS_PROCESSOR_INCLUDE_DIRS = [
     str(APPS_DIR) + '/static/sass',
     str(ROOT_DIR) + '/node_modules',
 ]
-print(SASS_PROCESSOR_INCLUDE_DIRS)
+
+
 SASS_PROCESSOR_ENABLED = True
 SASS_PROCESSOR_AUTO_INCLUDE = True
diff --git a/config/settings/stage.py b/config/settings/stage.py
index 7c2236e..c8e7d53 100644
--- a/config/settings/stage.py
+++ b/config/settings/stage.py
@@ -198,7 +198,7 @@ LOGGING = {
         'logfile': {
             'level':'DEBUG',
             'class':'logging.FileHandler',
-            'filename': ROOT_DIR.path("django.log"),
+            'filename': "%s/django.log" % ROOT_DIR,
         },
     },
     'loggers': {
diff --git a/mhackspace/__init__.py b/mhackspace/__init__.py
deleted file mode 100644
index 6b30497..0000000
--- a/mhackspace/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-__version__ = '0.1.0'
-__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/mhackspace/base/management/commands/generate_test_data.py b/mhackspace/base/management/commands/generate_test_data.py
index 1a5c5e6..da3d9c8 100644
--- a/mhackspace/base/management/commands/generate_test_data.py
+++ b/mhackspace/base/management/commands/generate_test_data.py
@@ -1,9 +1,13 @@
 from autofixture import AutoFixture
+from autofixture.generators import ImageGenerator
 from django.core.management.base import BaseCommand
 from mhackspace.base.models import BannerImages
 from mhackspace.feeds.models import Article, Feed
 from mhackspace.users.models import User
 
+class ImageFixture(AutoFixture):
+    class Values:
+        scaled_image = ImageGenerator(width=800, height=300, sizes=((1280, 300),))
 
 class Command(BaseCommand):
     help = 'Build test data for development environment'
@@ -18,9 +22,8 @@ class Command(BaseCommand):
         feeds = AutoFixture(Article)
         feeds.create(10)
 
-        banners = AutoFixture(BannerImages)
+        banners = ImageFixture(BannerImages)
         banners.create(10)
-
         self.stdout.write(
             self.style.SUCCESS(
                 'Finished creating test data'))
diff --git a/mhackspace/base/migrations/0002_auto_20170214_1911.py b/mhackspace/base/migrations/0002_auto_20170214_1911.py
new file mode 100644
index 0000000..9b9c3b2
--- /dev/null
+++ b/mhackspace/base/migrations/0002_auto_20170214_1911.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-14 19:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+import stdimage.models
+import stdimage.utils
+import stdimage.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bannerimages',
+            name='scaled_image',
+            field=stdimage.models.StdImageField(blank=True, null=True, upload_to=stdimage.utils.UploadToAutoSlugClassNameDir('title'), validators=[stdimage.validators.MinSizeValidator(800, 600)]),
+        ),
+    ]
diff --git a/mhackspace/base/models.py b/mhackspace/base/models.py
index bb36d3b..b8019ba 100644
--- a/mhackspace/base/models.py
+++ b/mhackspace/base/models.py
@@ -24,7 +24,7 @@ class BannerImages(models.Model):
                 "height": 220,
                 "crop": True}},
         validators=[
-            MinSizeValidator(800, 600))
+            MinSizeValidator(800, 600)])
 
     caption = models.TextField()
     date = models.DateTimeField(default=timezone.now)
diff --git a/mhackspace/templates/partials/banner_list.html b/mhackspace/templates/partials/banner_list.html
index f7ebc89..3e5c1c4 100644
--- a/mhackspace/templates/partials/banner_list.html
+++ b/mhackspace/templates/partials/banner_list.html
@@ -1,15 +1,17 @@
 {% load static %}
 <div id="carouselExampleSlidesOnly" class="carousel slide" data-ride="carousel">
-<div class="carousel-inner" role="listbox">
+<div class="carousel-inner" role="listbox" style="height:300px;">
   {% for banner in bannerlist %}
-
+{% if banner.scaled_image%}
     <div class="carousel-item {% if forloop.first %}active{% endif %}">
+
       <img class="img-fluid" src="{{ banner.scaled_image.url }}" alt="">
       <div class="carousel-caption d-none d-md-block">
         <h3>{{ banner.title }}</h3>
         <p>{{ banner.description |truncatewords:30}}</p>
       </div>
     </div>
+    {% endif %}
   {% endfor %}
 </div>
 </div>