From 8be9a4b1735f1238d17cfbd7f031b6ac544063fa Mon Sep 17 00:00:00 2001 From: androiddrew Date: Tue, 26 Mar 2019 17:22:59 -0400 Subject: [PATCH] Initial setup --- .gitignore | 2 + dev_requirements.in | 5 + dev_requirements.txt | 27 +++ services/cms/Dockerfile | 27 +++ services/cms/cms/__init__.py | 0 services/cms/cms/settings/__init__.py | 0 services/cms/cms/settings/base.py | 163 ++++++++++++++ services/cms/cms/settings/dev.py | 30 +++ services/cms/cms/settings/production.py | 8 + services/cms/cms/static/css/cms.css | 0 services/cms/cms/static/js/cms.js | 0 services/cms/cms/templates/404.html | 9 + services/cms/cms/templates/500.html | 13 ++ services/cms/cms/templates/base.html | 40 ++++ services/cms/cms/urls.py | 36 ++++ services/cms/cms/wsgi.py | 16 ++ services/cms/home/__init__.py | 0 services/cms/home/migrations/0001_initial.py | 22 ++ .../home/migrations/0002_create_homepage.py | 58 +++++ services/cms/home/migrations/__init__.py | 0 services/cms/home/models.py | 7 + services/cms/home/static/css/welcome_page.css | 204 ++++++++++++++++++ .../cms/home/templates/home/home_page.html | 21 ++ .../cms/home/templates/home/welcome_page.html | 52 +++++ services/cms/manage.py | 10 + services/cms/requirements.in | 4 + services/cms/requirements.txt | 30 +++ services/cms/search/__init__.py | 0 .../cms/search/templates/search/search.html | 38 ++++ services/cms/search/views.py | 34 +++ 30 files changed, 856 insertions(+) create mode 100644 dev_requirements.in create mode 100644 dev_requirements.txt create mode 100644 services/cms/Dockerfile create mode 100644 services/cms/cms/__init__.py create mode 100644 services/cms/cms/settings/__init__.py create mode 100644 services/cms/cms/settings/base.py create mode 100644 services/cms/cms/settings/dev.py create mode 100644 services/cms/cms/settings/production.py create mode 100644 services/cms/cms/static/css/cms.css create mode 100644 services/cms/cms/static/js/cms.js create mode 100644 services/cms/cms/templates/404.html create mode 100644 services/cms/cms/templates/500.html create mode 100644 services/cms/cms/templates/base.html create mode 100644 services/cms/cms/urls.py create mode 100644 services/cms/cms/wsgi.py create mode 100644 services/cms/home/__init__.py create mode 100644 services/cms/home/migrations/0001_initial.py create mode 100644 services/cms/home/migrations/0002_create_homepage.py create mode 100644 services/cms/home/migrations/__init__.py create mode 100644 services/cms/home/models.py create mode 100644 services/cms/home/static/css/welcome_page.css create mode 100644 services/cms/home/templates/home/home_page.html create mode 100644 services/cms/home/templates/home/welcome_page.html create mode 100755 services/cms/manage.py create mode 100644 services/cms/requirements.in create mode 100644 services/cms/requirements.txt create mode 100644 services/cms/search/__init__.py create mode 100644 services/cms/search/templates/search/search.html create mode 100644 services/cms/search/views.py diff --git a/.gitignore b/.gitignore index 7f7cccc..dfc2234 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ docs/_build/ # PyBuilder target/ +.DS_STORE +.idea/ \ No newline at end of file diff --git a/dev_requirements.in b/dev_requirements.in new file mode 100644 index 0000000..9a8b0b5 --- /dev/null +++ b/dev_requirements.in @@ -0,0 +1,5 @@ +pip-tools +pytest +pytest-cov +flake8 +black \ No newline at end of file diff --git a/dev_requirements.txt b/dev_requirements.txt new file mode 100644 index 0000000..a0d98a1 --- /dev/null +++ b/dev_requirements.txt @@ -0,0 +1,27 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile dev_requirements.txt +# +--trusted-host pypi.python.org + +appdirs==1.4.3 +atomicwrites==1.3.0 +attrs==19.1.0 +black==19.3b0 +click==7.0 +coverage==4.5.3 +entrypoints==0.3 +flake8==3.7.7 +mccabe==0.6.1 +more-itertools==6.0.0 +pip-tools==3.5.0 +pluggy==0.9.0 +py==1.8.0 +pycodestyle==2.5.0 +pyflakes==2.1.1 +pytest-cov==2.6.1 +pytest==4.3.1 +six==1.12.0 +toml==0.10.0 diff --git a/services/cms/Dockerfile b/services/cms/Dockerfile new file mode 100644 index 0000000..d085ba2 --- /dev/null +++ b/services/cms/Dockerfile @@ -0,0 +1,27 @@ +# Use an official Python runtime as a parent image +FROM python:3.7 +LABEL maintainer="drew@androiddrew.com" + +# Set environment varibles +ENV PYTHONUNBUFFERED 1 +ENV DJANGO_ENV dev + +COPY requirements.in /code/requirements.txt +RUN pip install --upgrade pip +# Install any needed packages specified in requirements.txt +RUN pip install -r /code/requirements.txt +RUN pip install gunicorn + +# Copy the current directory contents into the container at /code/ +COPY . /code/ +# Set the working directory to /code/ +WORKDIR /code/ + +RUN python manage.py migrate + +RUN useradd wagtail +RUN chown -R wagtail /code +USER wagtail + +EXPOSE 8000 +CMD exec gunicorn cms.wsgi:application --bind 0.0.0.0:8000 --workers 3 diff --git a/services/cms/cms/__init__.py b/services/cms/cms/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/services/cms/cms/settings/__init__.py b/services/cms/cms/settings/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/services/cms/cms/settings/base.py b/services/cms/cms/settings/base.py new file mode 100644 index 0000000..e198ada --- /dev/null +++ b/services/cms/cms/settings/base.py @@ -0,0 +1,163 @@ +""" +Django settings for cms project. + +Generated by 'django-admin startproject' using Django 2.1.7. + +For more information on this file, see +https://docs.djangoproject.com/en/2.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/2.1/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) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/ + + +# Application definition + +INSTALLED_APPS = [ + 'home', + 'search', + + 'wagtail.contrib.forms', + 'wagtail.contrib.redirects', + 'wagtail.embeds', + 'wagtail.sites', + 'wagtail.users', + 'wagtail.snippets', + 'wagtail.documents', + 'wagtail.images', + 'wagtail.search', + 'wagtail.admin', + 'wagtail.core', + + 'modelcluster', + 'taggit', + + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + + 'wagtail.core.middleware.SiteMiddleware', + 'wagtail.contrib.redirects.middleware.RedirectMiddleware', +] + +ROOT_URLCONF = 'cms.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ + os.path.join(PROJECT_DIR, 'templates'), + ], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'cms.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/2.1/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/2.1/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/2.1/howto/static-files/ + +STATICFILES_FINDERS = [ + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', +] + +STATICFILES_DIRS = [ + os.path.join(PROJECT_DIR, 'static'), +] + +# ManifestStaticFilesStorage is recommended in production, to prevent outdated +# Javascript / CSS assets being served from cache (e.g. after a Wagtail upgrade). +# See https://docs.djangoproject.com/en/2.1/ref/contrib/staticfiles/#manifeststaticfilesstorage +STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' + +STATIC_ROOT = os.path.join(BASE_DIR, 'static') +STATIC_URL = '/static/' + +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') +MEDIA_URL = '/media/' + + +# Wagtail settings + +WAGTAIL_SITE_NAME = "cms" + +# Base URL to use when referring to full URLs within the Wagtail admin backend - +# e.g. in notification emails. Don't include '/admin' or a trailing slash +BASE_URL = 'http://example.com' diff --git a/services/cms/cms/settings/dev.py b/services/cms/cms/settings/dev.py new file mode 100644 index 0000000..12af2ac --- /dev/null +++ b/services/cms/cms/settings/dev.py @@ -0,0 +1,30 @@ +from .base import * + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'kmh)s4=q@2i)r5$y!d5_ff88l0lxk*qcewq7fnetb7s^ssmhyk' + +# SECURITY WARNING: define the correct hosts in production! +ALLOWED_HOSTS = ['*'] + +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + +DATABASES = { + "default": { + "ENGINE": "django.db.backends.postgresql", + "NAME": "runcible_dev", + "USER": "runcible", + "PASSWORD": os.environ.get("DB_PASSWD") if os.environ.get("DB_PASSWD") else "", + "HOST": os.environ.get("DB_HOST") if os.environ.get("DB_HOST") else "127.0.0.1", + "PORT": "5432", + } +} + +COMMENTING = False + +try: + from .local import * +except ImportError: + pass diff --git a/services/cms/cms/settings/production.py b/services/cms/cms/settings/production.py new file mode 100644 index 0000000..9ca4ed7 --- /dev/null +++ b/services/cms/cms/settings/production.py @@ -0,0 +1,8 @@ +from .base import * + +DEBUG = False + +try: + from .local import * +except ImportError: + pass diff --git a/services/cms/cms/static/css/cms.css b/services/cms/cms/static/css/cms.css new file mode 100644 index 0000000..e69de29 diff --git a/services/cms/cms/static/js/cms.js b/services/cms/cms/static/js/cms.js new file mode 100644 index 0000000..e69de29 diff --git a/services/cms/cms/templates/404.html b/services/cms/cms/templates/404.html new file mode 100644 index 0000000..3a5500e --- /dev/null +++ b/services/cms/cms/templates/404.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% block body_class %}template-404{% endblock %} + +{% block content %} +

Page not found

+ +

Sorry, this page could not be found.

+{% endblock %} diff --git a/services/cms/cms/templates/500.html b/services/cms/cms/templates/500.html new file mode 100644 index 0000000..72b6406 --- /dev/null +++ b/services/cms/cms/templates/500.html @@ -0,0 +1,13 @@ + + + + + Internal server error + + + +

Internal server error

+ +

Sorry, there seems to be an error. Please try again soon.

+ + diff --git a/services/cms/cms/templates/base.html b/services/cms/cms/templates/base.html new file mode 100644 index 0000000..4306e91 --- /dev/null +++ b/services/cms/cms/templates/base.html @@ -0,0 +1,40 @@ +{% load static wagtailuserbar %} + + + + + + + {% block title %} + {% if self.seo_title %}{{ self.seo_title }}{% else %}{{ self.title }}{% endif %} + {% endblock %} + {% block title_suffix %} + {% with self.get_site.site_name as site_name %} + {% if site_name %}- {{ site_name }}{% endif %} + {% endwith %} + {% endblock %} + + + + + {# Global stylesheets #} + + + {% block extra_css %} + {# Override this in templates to add extra stylesheets #} + {% endblock %} + + + + {% wagtailuserbar %} + + {% block content %}{% endblock %} + + {# Global javascript #} + + + {% block extra_js %} + {# Override this in templates to add extra javascript #} + {% endblock %} + + diff --git a/services/cms/cms/urls.py b/services/cms/cms/urls.py new file mode 100644 index 0000000..4114338 --- /dev/null +++ b/services/cms/cms/urls.py @@ -0,0 +1,36 @@ +from django.conf import settings +from django.conf.urls import include, url +from django.contrib import admin + +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.core import urls as wagtail_urls +from wagtail.documents import urls as wagtaildocs_urls + +from search import views as search_views + +urlpatterns = [ + url(r'^django-admin/', admin.site.urls), + + url(r'^admin/', include(wagtailadmin_urls)), + url(r'^documents/', include(wagtaildocs_urls)), + + url(r'^search/$', search_views.search, name='search'), + + # For anything not caught by a more specific rule above, hand over to + # Wagtail's page serving mechanism. This should be the last pattern in + # the list: + url(r'', include(wagtail_urls)), + + # Alternatively, if you want Wagtail pages to be served from a subpath + # of your site, rather than the site root: + # url(r'^pages/', include(wagtail_urls)), +] + + +if settings.DEBUG: + from django.conf.urls.static import static + from django.contrib.staticfiles.urls import staticfiles_urlpatterns + + # Serve static and media files from development server + urlpatterns += staticfiles_urlpatterns() + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/services/cms/cms/wsgi.py b/services/cms/cms/wsgi.py new file mode 100644 index 0000000..7ee6868 --- /dev/null +++ b/services/cms/cms/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for cms 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/2.1/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cms.settings.dev") + +application = get_wsgi_application() diff --git a/services/cms/home/__init__.py b/services/cms/home/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/services/cms/home/migrations/0001_initial.py b/services/cms/home/migrations/0001_initial.py new file mode 100644 index 0000000..ef46d12 --- /dev/null +++ b/services/cms/home/migrations/0001_initial.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0040_page_draft_title'), + ] + + operations = [ + migrations.CreateModel( + name='HomePage', + fields=[ + ('page_ptr', models.OneToOneField(on_delete=models.CASCADE, parent_link=True, auto_created=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + ] diff --git a/services/cms/home/migrations/0002_create_homepage.py b/services/cms/home/migrations/0002_create_homepage.py new file mode 100644 index 0000000..039f0f5 --- /dev/null +++ b/services/cms/home/migrations/0002_create_homepage.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +from django.db import migrations + + +def create_homepage(apps, schema_editor): + # Get models + ContentType = apps.get_model('contenttypes.ContentType') + Page = apps.get_model('wagtailcore.Page') + Site = apps.get_model('wagtailcore.Site') + HomePage = apps.get_model('home.HomePage') + + # Delete the default homepage + # If migration is run multiple times, it may have already been deleted + Page.objects.filter(id=2).delete() + + # Create content type for homepage model + homepage_content_type, __ = ContentType.objects.get_or_create( + model='homepage', app_label='home') + + # Create a new homepage + homepage = HomePage.objects.create( + title="Home", + draft_title="Home", + slug='home', + content_type=homepage_content_type, + path='00010001', + depth=2, + numchild=0, + url_path='/home/', + ) + + # Create a site with the new homepage set as the root + Site.objects.create( + hostname='localhost', root_page=homepage, is_default_site=True) + + +def remove_homepage(apps, schema_editor): + # Get models + ContentType = apps.get_model('contenttypes.ContentType') + HomePage = apps.get_model('home.HomePage') + + # Delete the default homepage + # Page and Site objects CASCADE + HomePage.objects.filter(slug='home', depth=2).delete() + + # Delete content type for homepage model + ContentType.objects.filter(model='homepage', app_label='home').delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0001_initial'), + ] + + operations = [ + migrations.RunPython(create_homepage, remove_homepage), + ] diff --git a/services/cms/home/migrations/__init__.py b/services/cms/home/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/services/cms/home/models.py b/services/cms/home/models.py new file mode 100644 index 0000000..af7b579 --- /dev/null +++ b/services/cms/home/models.py @@ -0,0 +1,7 @@ +from django.db import models + +from wagtail.core.models import Page + + +class HomePage(Page): + pass diff --git a/services/cms/home/static/css/welcome_page.css b/services/cms/home/static/css/welcome_page.css new file mode 100644 index 0000000..ce8b149 --- /dev/null +++ b/services/cms/home/static/css/welcome_page.css @@ -0,0 +1,204 @@ +html { + box-sizing: border-box; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +body { + max-width: 960px; + min-height: 100vh; + margin: 0 auto; + padding: 0 15px; + color: #231f20; + font-family: 'Helvetica Neue', 'Segoe UI', Arial, sans-serif; + line-height: 1.25; +} + +a { + background-color: transparent; + color: #308282; + text-decoration: underline; +} + +a:hover { + color: #ea1b10; +} + +h1, +h2, +h3, +h4, +h5, +p, +ul { + padding: 0; + margin: 0; + font-weight: 400; +} + +main { + display: block; /* For IE11 support */ +} + +svg:not(:root) { + overflow: hidden; +} + +.header { + display: flex; + justify-content: space-between; + align-items: center; + padding-top: 20px; + padding-bottom: 10px; + border-bottom: 1px solid #e6e6e6; +} + +.logo { + width: 150px; + margin-right: 20px; +} + +.logo a { + display: block; +} + +.figure-logo { + max-width: 150px; + max-height: 55.1px; +} + +.release-notes { + font-size: 14px; +} + +.main { + padding: 40px 0; + margin: 0 auto; + text-align: center; +} + +.figure-space { + max-width: 265px; +} + +@-webkit-keyframes pos { + 0%, 100% { + -webkit-transform: rotate(-6deg); + transform: rotate(-6deg); + } + 50% { + -webkit-transform: rotate(6deg); + transform: rotate(6deg); + } +} + +@keyframes pos { + 0%, 100% { + -webkit-transform: rotate(-6deg); + transform: rotate(-6deg); + } + 50% { + -webkit-transform: rotate(6deg); + transform: rotate(6deg); + } +} + +.egg { + fill: #43b1b0; + -webkit-animation: pos 3s ease infinite; + animation: pos 3s ease infinite; + -webkit-transform: translateY(50px); + transform: translateY(50px); + -webkit-transform-origin: 50% 80%; + transform-origin: 50% 80%; +} + +.main-text { + max-width: 400px; + margin: 5px auto; +} + +.main-text h1 { + font-size: 22px; +} + +.main-text p { + margin: 15px auto 0; +} + +.footer { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + border-top: 1px solid #e6e6e6; + padding: 10px; +} + +.option { + display: block; + padding: 10px 10px 10px 34px; + position: relative; + text-decoration: none; +} + +.option svg { + width: 24px; + height: 24px; + fill: gray; + border: 1px solid #d9d9d9; + padding: 5px; + border-radius: 100%; + top: 10px; + left: 0; + position: absolute; +} + +.option h4 { + font-size: 19px; + text-decoration: underline; +} + +.option p { + padding-top: 3px; + color: #231f20; + font-size: 15px; + font-weight: 300; +} + +@media (max-width: 996px) { + body { + max-width: 780px; + } +} + +@media (max-width: 767px) { + .option { + flex: 0 0 50%; + } +} + +@media (max-width: 599px) { + .main { + padding: 20px 0; + } + + .figure-space { + max-width: 200px; + } + + .footer { + display: block; + width: 300px; + margin: 0 auto; + } +} + +@media (max-width: 360px) { + .header-link { + max-width: 100px; + } +} diff --git a/services/cms/home/templates/home/home_page.html b/services/cms/home/templates/home/home_page.html new file mode 100644 index 0000000..db9e9b0 --- /dev/null +++ b/services/cms/home/templates/home/home_page.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% load static %} + +{% block body_class %}template-homepage{% endblock %} + +{% block extra_css %} + +{% comment %} +Delete the line below if you're just getting started and want to remove the welcome screen! +{% endcomment %} + +{% endblock extra_css %} + +{% block content %} + +{% comment %} +Delete the line below if you're just getting started and want to remove the welcome screen! +{% endcomment %} +{% include 'home/welcome_page.html' %} + +{% endblock content %} diff --git a/services/cms/home/templates/home/welcome_page.html b/services/cms/home/templates/home/welcome_page.html new file mode 100644 index 0000000..8918e3e --- /dev/null +++ b/services/cms/home/templates/home/welcome_page.html @@ -0,0 +1,52 @@ +{% load i18n wagtailcore_tags %} + +
+ +
+ {% comment %} + This works for all cases but prerelease versions: + {% endcomment %} + + {% trans "View the release notes" %} + +
+
+
+
+ +
+
+

{% trans "Welcome to your new Wagtail site!" %}

+

{% trans 'Please feel free to join our community on Slack, or get started with one of the links below.' %}

+
+
+ diff --git a/services/cms/manage.py b/services/cms/manage.py new file mode 100755 index 0000000..733b38f --- /dev/null +++ b/services/cms/manage.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cms.settings.dev") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/services/cms/requirements.in b/services/cms/requirements.in new file mode 100644 index 0000000..af0577c --- /dev/null +++ b/services/cms/requirements.in @@ -0,0 +1,4 @@ +Django>=2.1,<2.2 +wagtail>=2.4,<2.5 +psycopg2==2.7.5 +gunicorn==19.9.0 \ No newline at end of file diff --git a/services/cms/requirements.txt b/services/cms/requirements.txt new file mode 100644 index 0000000..eab2d38 --- /dev/null +++ b/services/cms/requirements.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile requirements.in +# +--trusted-host pypi.python.org + +beautifulsoup4==4.6.0 # via wagtail +certifi==2019.3.9 # via requests +chardet==3.0.4 # via requests +django-modelcluster==4.3 # via wagtail +django-taggit==0.23.0 # via wagtail +django-treebeard==4.3 # via wagtail +django==2.1.7 +djangorestframework==3.9.2 # via wagtail +draftjs-exporter==2.1.5 # via wagtail +gunicorn==19.9.0 +html5lib==1.0.1 # via wagtail +idna==2.8 # via requests +pillow==5.4.1 # via wagtail +psycopg2==2.7.5 +pytz==2018.9 # via django, django-modelcluster, wagtail +requests==2.21.0 # via wagtail +six==1.12.0 # via html5lib, wagtail +unidecode==1.0.23 # via wagtail +urllib3==1.24.1 # via requests +wagtail==2.4 +webencodings==0.5.1 # via html5lib +willow==1.1 # via wagtail diff --git a/services/cms/search/__init__.py b/services/cms/search/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/services/cms/search/templates/search/search.html b/services/cms/search/templates/search/search.html new file mode 100644 index 0000000..5f222e5 --- /dev/null +++ b/services/cms/search/templates/search/search.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} +{% load static wagtailcore_tags %} + +{% block body_class %}template-searchresults{% endblock %} + +{% block title %}Search{% endblock %} + +{% block content %} +

Search

+ +
+ + +
+ + {% if search_results %} + + + {% if search_results.has_previous %} + Previous + {% endif %} + + {% if search_results.has_next %} + Next + {% endif %} + {% elif search_query %} + No results found + {% endif %} +{% endblock %} diff --git a/services/cms/search/views.py b/services/cms/search/views.py new file mode 100644 index 0000000..eeace7c --- /dev/null +++ b/services/cms/search/views.py @@ -0,0 +1,34 @@ +from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator +from django.shortcuts import render + +from wagtail.core.models import Page +from wagtail.search.models import Query + + +def search(request): + search_query = request.GET.get('query', None) + page = request.GET.get('page', 1) + + # Search + if search_query: + search_results = Page.objects.live().search(search_query) + query = Query.get(search_query) + + # Record hit + query.add_hit() + else: + search_results = Page.objects.none() + + # Pagination + paginator = Paginator(search_results, 10) + try: + search_results = paginator.page(page) + except PageNotAnInteger: + search_results = paginator.page(1) + except EmptyPage: + search_results = paginator.page(paginator.num_pages) + + return render(request, 'search/search.html', { + 'search_query': search_query, + 'search_results': search_results, + })