Commit a4fe4e16 authored by gijs's avatar gijs
Browse files

Renamed apps.

parent 0463497a
......@@ -57,4 +57,4 @@ RUN python manage.py collectstatic --noinput --clear
# PRACTICE. The database should be migrated manually or using the release
# phase facilities of your hosting platform. This is used only so the
# Wagtail instance can be started with a simple "docker run" command.
CMD set -xe; python manage.py migrate --noinput; gunicorn website.wsgi:application
CMD set -xe; python manage.py migrate --noinput; gunicorn nord.wsgi:application
......@@ -3,7 +3,7 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "website.settings.dev")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "nord.settings.dev")
from django.core.management import execute_from_command_line
......
# Generated by Django 3.1.2 on 2021-02-05 09:02
from django.db import migrations
import nord.models
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
class Migration(migrations.Migration):
dependencies = [
('nord', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='projectpage',
name='body',
field=wagtail.core.fields.StreamField([('heading', nord.models.HeadingBlock()), ('paragraph', wagtail.core.blocks.RichTextBlock()), ('quote', wagtail.core.blocks.BlockQuoteBlock()), ('datablock', wagtail.core.blocks.StreamBlock([('datarow', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.ChoiceBlock(choices=[(0, 'Status'), (1, 'Procedure'), (2, 'Area'), (3, 'Budget'), (4, 'Team: Architecture'), (5, 'Team: Public space'), (6, 'Team: Landscape'), (7, 'Team: Structure Ir'), (8, 'Team: HVAC Ir'), (9, 'Team: Energy performance '), (10, 'Team: Acoustic '), (11, 'Team: Graphic Design'), (12, 'Team: Artist collaborator'), (13, 'Team: BIM manager'), (14, 'Team: Participation'), (15, 'Team: Design'), (16, 'Sub-contractor: Architecture'), (17, 'Sub-contractor: Public space'), (18, 'Sub-contractor: Landscape'), (19, 'Sub-contractor: Structure Ir'), (20, 'Sub-contractor: HVAC Ir'), (21, 'Sub-contractor: Energy performance '), (22, 'Sub-contractor: Acoustic '), (23, 'Sub-contractor: Graphic Design'), (24, 'Sub-contractor: Artist collaborator'), (25, 'Sub-contractor: BIM manager'), (26, 'Sub-contractor: Participation'), (27, 'Sub-contractor: Design'), (28, 'Built area'), (29, 'Renovated area'), (30, 'Surroundings area'), (31, 'Initial budget'), (32, 'Adjudication budget'), (33, 'Final budget'), (34, 'Study start'), (35, 'Expeted delivery date'), (36, 'Delivery date')], classname='field-col col6', form_classname='field-col col6')), ('value', wagtail.core.blocks.CharBlock(classname='field-col col6', form_classname='field-col col6'))])), ('dataheader', wagtail.core.blocks.CharBlock())], icon='table')), ('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock()), ('gallery', wagtail.core.blocks.StreamBlock([('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock())]))]),
),
]
......@@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(PROJECT_DIR)
INSTALLED_APPS = [
'home',
'search',
'nord',
'projects',
'wagtail.contrib.forms',
'wagtail.contrib.redirects',
......@@ -64,7 +64,7 @@ MIDDLEWARE = [
'wagtail.contrib.redirects.middleware.RedirectMiddleware',
]
ROOT_URLCONF = 'website.urls'
ROOT_URLCONF = 'nord.urls'
TEMPLATES = [
{
......@@ -84,7 +84,7 @@ TEMPLATES = [
},
]
WSGI_APPLICATION = 'website.wsgi.application'
WSGI_APPLICATION = 'nord.wsgi.application'
# Database
......@@ -157,7 +157,7 @@ MEDIA_URL = '/media/'
# Wagtail settings
WAGTAIL_SITE_NAME = "website"
WAGTAIL_SITE_NAME = "Nord"
# 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
......
......@@ -18,7 +18,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
{# Global stylesheets #}
<link rel="stylesheet" type="text/css" href="{% static 'css/website.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/nord.css' %}">
{% block extra_css %}
{# Override this in templates to add extra stylesheets #}
......@@ -31,7 +31,7 @@
{% block content %}{% endblock %}
{# Global javascript #}
<script type="text/javascript" src="{% static 'js/website.js' %}"></script>
<script type="text/javascript" src="{% static 'js/nord.js' %}"></script>
{% block extra_js %}
{# Override this in templates to add extra javascript #}
......
......@@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "website.settings.dev")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "nord.settings.dev")
application = get_wsgi_application()
......@@ -2,7 +2,7 @@
from django.db import migrations, models
import django.db.models.deletion
import nord.models
import projects.models
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
......@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
('location', models.CharField(max_length=250)),
('date', models.DateField()),
('short_description', wagtail.core.fields.RichTextField()),
('body', wagtail.core.fields.StreamField([('heading', nord.models.HeadingBlock()), ('paragraph', wagtail.core.blocks.RichTextBlock()), ('quote', wagtail.core.blocks.BlockQuoteBlock()), ('datablock', wagtail.core.blocks.ListBlock(nord.models.DataBlock, icon='table')), ('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock()), ('gallery', wagtail.core.blocks.StreamBlock([('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock())]))])),
('body', wagtail.core.fields.StreamField([('heading', projects.models.HeadingBlock()), ('paragraph', wagtail.core.blocks.RichTextBlock()), ('quote', wagtail.core.blocks.BlockQuoteBlock()), ('datablock', wagtail.core.blocks.ListBlock(projects.models.DataBlock, icon='table')), ('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock()), ('gallery', wagtail.core.blocks.StreamBlock([('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock())]))])),
],
options={
'abstract': False,
......
# Generated by Django 3.1.2 on 2021-02-05 09:02
from django.db import migrations
import projects.models
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
class Migration(migrations.Migration):
dependencies = [
('projects', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='projectpage',
name='body',
field=wagtail.core.fields.StreamField([('heading', projects.models.HeadingBlock()), ('paragraph', wagtail.core.blocks.RichTextBlock()), ('quote', wagtail.core.blocks.BlockQuoteBlock()), ('datablock', wagtail.core.blocks.StreamBlock([('datarow', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.ChoiceBlock(choices=[(0, 'Status'), (1, 'Procedure'), (2, 'Area'), (3, 'Budget'), (4, 'Team: Architecture'), (5, 'Team: Public space'), (6, 'Team: Landscape'), (7, 'Team: Structure Ir'), (8, 'Team: HVAC Ir'), (9, 'Team: Energy performance '), (10, 'Team: Acoustic '), (11, 'Team: Graphic Design'), (12, 'Team: Artist collaborator'), (13, 'Team: BIM manager'), (14, 'Team: Participation'), (15, 'Team: Design'), (16, 'Sub-contractor: Architecture'), (17, 'Sub-contractor: Public space'), (18, 'Sub-contractor: Landscape'), (19, 'Sub-contractor: Structure Ir'), (20, 'Sub-contractor: HVAC Ir'), (21, 'Sub-contractor: Energy performance '), (22, 'Sub-contractor: Acoustic '), (23, 'Sub-contractor: Graphic Design'), (24, 'Sub-contractor: Artist collaborator'), (25, 'Sub-contractor: BIM manager'), (26, 'Sub-contractor: Participation'), (27, 'Sub-contractor: Design'), (28, 'Built area'), (29, 'Renovated area'), (30, 'Surroundings area'), (31, 'Initial budget'), (32, 'Adjudication budget'), (33, 'Final budget'), (34, 'Study start'), (35, 'Expeted delivery date'), (36, 'Delivery date')], classname='field-col col6', form_classname='field-col col6')), ('value', wagtail.core.blocks.CharBlock(classname='field-col col6', form_classname='field-col col6'))])), ('dataheader', wagtail.core.blocks.CharBlock())], icon='table')), ('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock()), ('gallery', wagtail.core.blocks.StreamBlock([('plan', wagtail.images.blocks.ImageChooserBlock()), ('picture', wagtail.images.blocks.ImageChooserBlock())]))]),
),
]
......@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('nord', '0002_auto_20210205_0902'),
('projects', '0002_auto_20210205_0902'),
]
operations = [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment