Resolve conflict

.gitignore

@@ -1,11 +0,0 @@
-*.pyc
-.DS_Store
-.idea/*
-.idea/vcs.xml
-*.swp
-/venv/
-/static/
-/media/
-/tmp/
-/.vagrant/
-/Vagrantfile.local

bakerydemo/breads/migrations/0001_initial.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-09 15:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('wagtailcore', '0032_add_bulk_delete_page_permission'),
+        ('wagtailimages', '0018_remove_rendition_filter'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BreadPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                ('description', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock())))),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+        migrations.CreateModel(
+            name='BreadsLandingPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+        migrations.CreateModel(
+            name='BreadType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+            ],
+            options={
+                'verbose_name_plural': 'Bread types',
+            },
+        ),
+        migrations.CreateModel(
+            name='Country',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+            ],
+            options={
+                'verbose_name_plural': 'Countries of Origin',
+            },
+        ),
+        migrations.AddField(
+            model_name='breadpage',
+            name='bread_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='breads.BreadType'),
+        ),
+        migrations.AddField(
+            model_name='breadpage',
+            name='image',
+            field=models.ForeignKey(blank=True, help_text='Landscape mode only; horizontal width between 1000px and 3000px.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image'),
+        ),
+        migrations.AddField(
+            model_name='breadpage',
+            name='origin',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='breads.Country'),
+        ),
+    ]

bakerydemo/breads/models.py

@@ -0,0 +1,101 @@
+
+from django.db import models
+
+
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailcore.fields import StreamField
+from wagtail.wagtailadmin.edit_handlers import FieldPanel, StreamFieldPanel
+
+from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+from wagtail.wagtailsearch import index
+from wagtail.wagtailcore import blocks
+from wagtail.wagtailsnippets.models import register_snippet
+
+
+@register_snippet
+class Country(models.Model):
+    '''
+    Standard Django model to store set of countries of origin.
+    Exposed in the Wagtail admin via Snippets.
+    '''
+
+    title = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.title
+
+    class Meta:
+        verbose_name_plural = "Countries of Origin"
+
+
+class BreadsLandingPage(Page):
+    '''
+    Home page for breads. Nothing needed in the model here - we'll just
+    create an instance, then pull its children into the template.
+    '''
+
+    pass
+
+
+@register_snippet
+class BreadType(models.Model):
+    '''
+    Standard Django model used as a Snippet in the BreadPage model.
+    '''
+
+    title = models.CharField(max_length=255)
+
+    panels = [
+        FieldPanel('title'),
+    ]
+
+    def __str__(self):
+        return self.title
+
+    class Meta:
+        verbose_name_plural = "Bread types"
+
+
+class BreadPage(Page):
+    '''
+    Detail view for a specific bread
+    '''
+
+    origin = models.ForeignKey(
+        Country,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        )
+    description = StreamField([
+        ('heading', blocks.CharBlock(classname="full title")),
+        ('paragraph', blocks.RichTextBlock()),
+    ])
+    bread_type = models.ForeignKey(
+        'breads.BreadType',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='+'
+    )
+    image = models.ForeignKey(
+        'wagtailimages.Image',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='+',
+        help_text='Landscape mode only; horizontal width between 1000px and 3000px.'
+    )
+
+    content_panels = [
+        FieldPanel('title'),
+        FieldPanel('origin'),
+        FieldPanel('bread_type'),
+        ImageChooserPanel('image'),
+        StreamFieldPanel('description'),
+    ]
+
+    search_fields = Page.search_fields + [
+        index.SearchField('title'),
+        index.SearchField('description'),
+    ]

bakerydemo/settings/.gitignore

@@ -1 +0,0 @@
-/local.py

bakerydemo/settings/base.py

@@ -1,24 +1,31 @@
 """
-Django settings for bakerydemo project.
+Django settings for temp project.
 
-Generated by 'django-admin startproject' using Django 1.8.2.
+Generated by 'django-admin startproject' using Django 1.10.5.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.8/topics/settings/
+https://docs.djangoproject.com/en/1.10/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.8/ref/settings/
+https://docs.djangoproject.com/en/1.10/ref/settings/
 """
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
-PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-BASE_DIR = os.path.dirname(PROJECT_DIR)
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+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.8/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'c6u0-9c!7nilj_ysatsda0(f@e_2mws2f!6m0n^o*4#*q#kzp)'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
 
 
 # Application definition
@@ -41,10 +48,10 @@ INSTALLED_APPS = [
     'wagtail.wagtailimages',
     'wagtail.wagtailsearch',
     'wagtail.wagtailadmin',
+    'wagtail.contrib.modeladmin',
     'wagtail.wagtailcore',
 
     'modelcluster',
-    'compressor',
     'taggit',
     'wagtailfontawesome',
 
@@ -56,7 +63,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
 ]
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -67,6 +74,7 @@ MIDDLEWARE_CLASSES = [
 
     'wagtail.wagtailcore.middleware.SiteMiddleware',
     'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+
 ]
 
 ROOT_URLCONF = 'bakerydemo.urls'
@@ -74,9 +82,7 @@ ROOT_URLCONF = 'bakerydemo.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            os.path.join(PROJECT_DIR, 'templates'),
-        ],
+        'DIRS': [],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -93,18 +99,18 @@ WSGI_APPLICATION = 'bakerydemo.wsgi.application'
 
 
 # Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.10/ref/settings/#databases
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'bakerydemo',
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'bakerydemodb',
     }
 }
 
 
 # Password validation
-# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -123,11 +129,11 @@ AUTH_PASSWORD_VALIDATORS = [
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.8/topics/i18n/
+# https://docs.djangoproject.com/en/1.10/topics/i18n/
 
-LANGUAGE_CODE = 'en-gb'
+LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'Europe/London'
+TIME_ZONE = 'UTC'
 
 USE_I18N = True
 
@@ -136,6 +142,7 @@ USE_L10N = True
 USE_TZ = True
 
 
+
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
@@ -145,9 +152,9 @@ STATICFILES_FINDERS = [
     'compressor.finders.CompressorFinder',
 ]
 
-STATICFILES_DIRS = [
-    os.path.join(PROJECT_DIR, 'static'),
-]
+# STATICFILES_DIRS = [
+#     os.path.join(PROJECT_DIR, 'static'),
+# ]
 
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATIC_URL = '/static/'
@@ -155,39 +162,14 @@ STATIC_URL = '/static/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 MEDIA_URL = '/media/'
 
-
-# Django compressor settings
-# http://django-compressor.readthedocs.org/en/latest/settings/
-
-COMPRESS_PRECOMPILERS = [
-    ('text/x-scss', 'django_libsass.SassCompiler'),
-]
-
-
-# Use Redis as the cache backend for extra performance
-
-CACHES = {
-    'default': {
-        'BACKEND': 'django_redis.cache.RedisCache',
-        'LOCATION': '127.0.0.1:6379',
-        'KEY_PREFIX': 'bakerydemo',
-        'OPTIONS': {
-            'CLIENT_CLASS': 'django_redis.client.DefaultClient',
-        }
-    }
-}
-
-
 # Use Elasticsearch as the search backend for extra performance and better search results
-
 WAGTAILSEARCH_BACKENDS = {
     'default': {
-        'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
+        'BACKEND': 'wagtail.wagtailsearch.backends.db',
         'INDEX': 'bakerydemo',
     },
 }
 
-
 # Wagtail settings
 
 WAGTAIL_SITE_NAME = "bakerydemo"

bakerydemo/settings/production.py

@@ -88,38 +88,6 @@ else:
     }
 
 
-# Redis
-# Redis location can either be passed through with REDIS_HOST or REDIS_SOCKET
-
-if 'REDIS_URL' in env:
-    REDIS_LOCATION = env['REDIS_URL']
-    BROKER_URL = env['REDIS_URL']
-
-elif 'REDIS_HOST' in env:
-    REDIS_LOCATION = env['REDIS_HOST']
-    BROKER_URL = 'redis://%s' % env['REDIS_HOST']
-
-elif 'REDIS_SOCKET' in env:
-    REDIS_LOCATION = 'unix://%s' % env['REDIS_SOCKET']
-    BROKER_URL = 'redis+socket://%s' % env['REDIS_SOCKET']
-
-else:
-    REDIS_LOCATION = None
-
-
-if REDIS_LOCATION is not None:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django_redis.cache.RedisCache',
-            'LOCATION': REDIS_LOCATION,
-            'KEY_PREFIX': APP_NAME,
-            'OPTIONS': {
-                'CLIENT_CLASS': 'django_redis.client.DefaultClient',
-            }
-        }
-    }
-
-
 # Elasticsearch
 
 if 'ELASTICSEARCH_URL' in env:

bakerydemo/wsgi.py

@@ -1,19 +1,14 @@
 """
-WSGI config for bakerydemo project.
+WSGI config for portal 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.8/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/
 """
 
 import os
-
-from whitenoise.django import DjangoWhiteNoise
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bakerydemo.settings")
 
 from django.core.wsgi import get_wsgi_application
-
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bakerydemo.settings.production")
-
-application = DjangoWhiteNoise(get_wsgi_application())
+application = get_wsgi_application()

requirements.txt

@@ -1,17 +1,4 @@
-Django==1.9.9
-psycopg2==2.6.1
-elasticsearch==1.2.0
-django-redis==4.3.0
-wagtail==1.5.3
-django-libsass==0.6
-libsass==0.8.3
-Pillow==2.9.0
-
-# Development tools
-stellar==0.4.3
-
-# Production dependencies
-dj-database-url==0.3.0
-whitenoise==2.0.4
-uwsgi==2.0.11.2
-ConcurrentLogHandler==0.9.1
+Django
+elasticsearch
+wagtail
+Pillow