added campsite model, refactored some code to avoid circular imports,

reorganized some auxilary functions and fixed broken build JS.

2 files changed, 26 insertions, 3 deletions

diff --git a/app/sightings/migrations/0006_auto_20180707_0958.py b/app/sightings/migrations/0006_auto_20180707_0958.py
new file mode 100644
index 0000000..1db6cc8
--- /dev/null
+++ b/app/sightings/migrations/0006_auto_20180707_0958.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.0.1 on 2018-07-07 09:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sightings', '0005_auto_20180516_1759'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='sighting',
+            old_name='date',
+            new_name='pub_date',
+        ),
+        migrations.AlterField(
+            model_name='ap',
+            name='image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='photos.LuxImage'),
+        ),
+    ]
diff --git a/app/sightings/models.py b/app/sightings/models.py
index 7368bd4..fd5cba6 100644
--- a/app/sightings/models.py
+++ b/app/sightings/models.py
@@ -10,12 +10,11 @@ from django import forms
 from django.conf import settings
 
 from bs4 import BeautifulSoup
-# from photos.models import LuxImage
 
 from locations.models import Location
 from photos.models import LuxImage
-from utils.widgets import parse_image
-from utils.widgets import markdown_to_html
+
+from utils.util import parse_image, markdown_to_html
 from utils.next_prev import next_in_order, prev_in_order