diff --git a/api/models.py b/api/models.py index e8ed5c9..9fae33b 100644 --- a/api/models.py +++ b/api/models.py @@ -1,5 +1,7 @@ from django.db import models from django.contrib.auth.models import User +from django.db.models.fields import CharField, IntegerField + # Create your models here. class Province(models.Model): diff --git a/api/templatetags/markdown_extras.py b/api/templatetags/api_markdown_extras.py similarity index 100% rename from api/templatetags/markdown_extras.py rename to api/templatetags/api_markdown_extras.py diff --git a/blog/templatetags/markdown_extras.py b/blog/templatetags/blog_markdown_extras.py similarity index 100% rename from blog/templatetags/markdown_extras.py rename to blog/templatetags/blog_markdown_extras.py diff --git a/docker-compose.yml b/docker-compose.yml index 0784b53..08a2b9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: network_mode: "host" command: > sh -c "python manage.py makemigrations blog --noinput && + python manage.py makemigrations api --noinput && python manage.py migrate --noinput && python manage.py collectstatic --noinput && gunicorn BH.wsgi:application --bind 0.0.0.0:3030 --workers ${GUNICORN_WORKERS:-3}" diff --git a/requirements.txt b/requirements.txt index f85abcc..c0e9c6c 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/templates/blog/blogDetail.html b/templates/blog/blogDetail.html index 73a5bbe..d6ecd0f 100644 --- a/templates/blog/blogDetail.html +++ b/templates/blog/blogDetail.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% block content %} -{% load markdown_extras %} +{% load blog_markdown_extras %}