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

reorganized some auxilary functions and fixed broken build JS.

3 files changed, 75 insertions, 0 deletions

diff --git a/app/locations/migrations/0007_campsite.py b/app/locations/migrations/0007_campsite.py
new file mode 100644
index 0000000..116b5ed
--- /dev/null
+++ b/app/locations/migrations/0007_campsite.py
@@ -0,0 +1,37 @@
+# Generated by Django 2.0.1 on 2018-07-07 09:58
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photos', '0018_auto_20161130_1218'),
+        ('locations', '0006_auto_20180629_1739'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Campsite',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('point', django.contrib.gis.db.models.fields.PointField(blank=True, srid=4326)),
+                ('date_arrived', models.DateField(default=django.utils.timezone.now)),
+                ('date_left', models.DateField(default=django.utils.timezone.now)),
+                ('campsite_type', models.IntegerField(choices=[(0, 'National Park'), (1, 'National Forest'), (2, 'National Other'), (3, 'State Park'), (4, 'State Forest'), (5, 'County Park'), (6, 'City Park'), (7, 'Boondocking'), (8, 'Other')], default=0)),
+                ('campsite_number', models.IntegerField(blank=True, null=True)),
+                ('campsite_we_wish_we_had', models.IntegerField(blank=True, null=True)),
+                ('body_markdown', models.TextField(blank=True, null=True)),
+                ('body_html', models.TextField(blank=True, null=True)),
+                ('image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='photos.LuxImage')),
+                ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location')),
+            ],
+            options={
+                'ordering': ('-date_arrived',),
+                'get_latest_by': 'date_arrived',
+            },
+        ),
+    ]
diff --git a/app/locations/migrations/0008_campsite_name.py b/app/locations/migrations/0008_campsite_name.py
new file mode 100644
index 0000000..7b5c513
--- /dev/null
+++ b/app/locations/migrations/0008_campsite_name.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.1 on 2018-07-07 13:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locations', '0007_campsite'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='campsite',
+            name='name',
+            field=models.CharField(default='st louis', max_length=200),
+            preserve_default=False,
+        ),
+    ]
diff --git a/app/locations/migrations/0009_auto_20180707_1403.py b/app/locations/migrations/0009_auto_20180707_1403.py
new file mode 100644
index 0000000..3561e4e
--- /dev/null
+++ b/app/locations/migrations/0009_auto_20180707_1403.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.1 on 2018-07-07 14:03
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locations', '0008_campsite_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='campsite',
+            name='date_left',
+            field=models.DateField(blank=True, default=django.utils.timezone.now, null=True),
+        ),
+    ]