diff --git a/im/settings.py.prod b/im/settings.py.prod index 1f9e3a6..d947778 100644 --- a/im/settings.py.prod +++ b/im/settings.py.prod @@ -26,7 +26,7 @@ SECRET_KEY = '{{im_secret_key}}' DEBUG = False ALLOWED_HOSTS = [ - {{im_domain}} + '{{im_domain}}' ] @@ -82,7 +82,7 @@ DATABASES = { 'NAME': '{{im_db_name}}', 'USER': '{{im_db_user}}', 'PASSWORD': '{{im_db_password}}', - 'HOST': '{{im_db_server_ip}}', + 'HOST': '{{im_db_server}}', 'PORT': '{{im_db_port}}', } } diff --git a/inventory/migrations/0001_initial.py b/inventory/migrations/0001_initial.py deleted file mode 100644 index 73388de..0000000 --- a/inventory/migrations/0001_initial.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 10:49 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='PantryItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=200)), - ], - ), - migrations.CreateModel( - name='PantryItemLine', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quantity', models.IntegerField(default=1)), - ('expiry_date', models.DateTimeField()), - ('pantry_item', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='inventory.PantryItem')), - ], - ), - ] diff --git a/inventory/migrations/0002_auto_20180916_1110.py b/inventory/migrations/0002_auto_20180916_1110.py deleted file mode 100644 index 52baf0d..0000000 --- a/inventory/migrations/0002_auto_20180916_1110.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 11:10 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='pantryitem', - name='category', - field=models.CharField(choices=[('UC', 'UNCATEGORIZED'), ('GS', 'GENRAL_STOCK'), ('CANS', 'CANS'), ('BR', 'BREAKFAST'), ('SAV', 'SAVORIES'), ('SW', 'SWEETS'), ('SN', 'SNACKS'), ('SP', 'SPICES')], default='UN', max_length=200), - preserve_default=False, - ), - migrations.AlterField( - model_name='pantryitemline', - name='expiry_date', - field=models.DateField(), - ), - migrations.AlterField( - model_name='pantryitemline', - name='pantry_item', - field=models.ForeignKey(default='UN', on_delete=django.db.models.deletion.PROTECT, to='inventory.PantryItem'), - ), - ] diff --git a/inventory/migrations/0003_pantryitem_min_quantity.py b/inventory/migrations/0003_pantryitem_min_quantity.py deleted file mode 100644 index a750107..0000000 --- a/inventory/migrations/0003_pantryitem_min_quantity.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 11:12 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0002_auto_20180916_1110'), - ] - - operations = [ - migrations.AddField( - model_name='pantryitem', - name='min_quantity', - field=models.IntegerField(default=1), - ), - ] diff --git a/inventory/migrations/0004_auto_20180916_1127.py b/inventory/migrations/0004_auto_20180916_1127.py deleted file mode 100644 index 6c87e35..0000000 --- a/inventory/migrations/0004_auto_20180916_1127.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 11:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0003_pantryitem_min_quantity'), - ] - - operations = [ - migrations.AddField( - model_name='pantryitemline', - name='size', - field=models.CharField(max_length=20, null=True), - ), - migrations.AlterField( - model_name='pantryitem', - name='category', - field=models.CharField(choices=[('UC', 'UNCATEGORIZED'), ('GS', 'GENRAL_STOCK'), ('CANS', 'CANS'), ('BR', 'BREAKFAST'), ('SAV', 'SAVORIES'), ('SW', 'SWEETS'), ('SN', 'SNACKS'), ('SP', 'SPICES'), ('DR', 'DRINKS')], max_length=200), - ), - ] diff --git a/inventory/migrations/0005_auto_20180916_1154.py b/inventory/migrations/0005_auto_20180916_1154.py deleted file mode 100644 index de43b70..0000000 --- a/inventory/migrations/0005_auto_20180916_1154.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 11:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0004_auto_20180916_1127'), - ] - - operations = [ - migrations.AddField( - model_name='pantryitem', - name='info', - field=models.CharField(max_length=200, null=True), - ), - migrations.AddField( - model_name='pantryitemline', - name='info', - field=models.CharField(max_length=200, null=True), - ), - migrations.AlterField( - model_name='pantryitemline', - name='size', - field=models.IntegerField(default=1), - ), - ] diff --git a/inventory/migrations/0006_auto_20180916_1156.py b/inventory/migrations/0006_auto_20180916_1156.py deleted file mode 100644 index 360ac02..0000000 --- a/inventory/migrations/0006_auto_20180916_1156.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 11:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0005_auto_20180916_1154'), - ] - - operations = [ - migrations.AddField( - model_name='pantryitem', - name='unit', - field=models.CharField(choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags')], max_length=20, null=True), - ), - migrations.AddField( - model_name='pantryitemline', - name='unit', - field=models.CharField(choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags')], max_length=20, null=True), - ), - ] diff --git a/inventory/migrations/0007_auto_20180916_1203.py b/inventory/migrations/0007_auto_20180916_1203.py deleted file mode 100644 index fc18d92..0000000 --- a/inventory/migrations/0007_auto_20180916_1203.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 12:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0006_auto_20180916_1156'), - ] - - operations = [ - migrations.AlterField( - model_name='pantryitem', - name='info', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AlterField( - model_name='pantryitemline', - name='info', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/inventory/migrations/0008_auto_20180916_1205.py b/inventory/migrations/0008_auto_20180916_1205.py deleted file mode 100644 index 8022234..0000000 --- a/inventory/migrations/0008_auto_20180916_1205.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 12:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0007_auto_20180916_1203'), - ] - - operations = [ - migrations.AlterField( - model_name='pantryitem', - name='unit', - field=models.CharField(blank=True, choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags')], max_length=20, null=True), - ), - migrations.AlterField( - model_name='pantryitemline', - name='unit', - field=models.CharField(blank=True, choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags')], max_length=20, null=True), - ), - ] diff --git a/inventory/migrations/0009_auto_20180916_1219.py b/inventory/migrations/0009_auto_20180916_1219.py deleted file mode 100644 index 7d28d6e..0000000 --- a/inventory/migrations/0009_auto_20180916_1219.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 12:19 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0008_auto_20180916_1205'), - ] - - operations = [ - migrations.AlterField( - model_name='pantryitem', - name='unit', - field=models.CharField(blank=True, choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags'), ('Roll', 'Roll')], max_length=20, null=True), - ), - migrations.AlterField( - model_name='pantryitemline', - name='expiry_date', - field=models.DateField(blank=True, null=True), - ), - migrations.AlterField( - model_name='pantryitemline', - name='unit', - field=models.CharField(blank=True, choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags'), ('Roll', 'Roll')], max_length=20, null=True), - ), - ] diff --git a/inventory/migrations/0010_auto_20180916_1252.py b/inventory/migrations/0010_auto_20180916_1252.py deleted file mode 100644 index af7840d..0000000 --- a/inventory/migrations/0010_auto_20180916_1252.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-16 12:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0009_auto_20180916_1219'), - ] - - operations = [ - migrations.AlterField( - model_name='pantryitem', - name='min_quantity', - field=models.DecimalField(decimal_places=3, default=1, max_digits=32), - ), - migrations.AlterField( - model_name='pantryitem', - name='unit', - field=models.CharField(blank=True, choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags'), ('Roll', 'Roll'), ('Tube', 'Tube'), ('Bag', 'Bag')], max_length=20, null=True), - ), - migrations.AlterField( - model_name='pantryitemline', - name='size', - field=models.DecimalField(decimal_places=3, default=1, max_digits=32), - ), - migrations.AlterField( - model_name='pantryitemline', - name='unit', - field=models.CharField(blank=True, choices=[('L', 'Liter'), ('GR', 'Grams'), ('Bags', 'Bags'), ('Roll', 'Roll'), ('Tube', 'Tube'), ('Bag', 'Bag')], max_length=20, null=True), - ), - ] diff --git a/inventory/migrations/0011_auto_20180923_2025.py b/inventory/migrations/0011_auto_20180923_2025.py deleted file mode 100644 index 8a423ff..0000000 --- a/inventory/migrations/0011_auto_20180923_2025.py +++ /dev/null @@ -1,57 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-23 20:25 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0010_auto_20180916_1252'), - ] - - operations = [ - migrations.CreateModel( - name='Category', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50)), - ], - ), - migrations.CreateModel( - name='Unit', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('unit', models.CharField(max_length=50)), - ], - ), - migrations.RemoveField( - model_name='pantryitemline', - name='unit', - ), - migrations.AlterField( - model_name='pantryitem', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='inventory.Category'), - ), - migrations.AlterField( - model_name='pantryitem', - name='min_quantity', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='pantryitem', - name='unit', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.Unit'), - ), - migrations.AlterField( - model_name='pantryitemline', - name='pantry_item', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='inventory.PantryItem'), - ), - migrations.AlterField( - model_name='pantryitemline', - name='size', - field=models.IntegerField(default=1), - ), - ] diff --git a/inventory/migrations/0012_auto_20180923_2037.py b/inventory/migrations/0012_auto_20180923_2037.py deleted file mode 100644 index a9c51b9..0000000 --- a/inventory/migrations/0012_auto_20180923_2037.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-23 20:37 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0011_auto_20180923_2025'), - ] - - operations = [ - migrations.RenameField( - model_name='unit', - old_name='unit', - new_name='name', - ), - ] diff --git a/inventory/migrations/0013_pantryitem_expiry_duration.py b/inventory/migrations/0013_pantryitem_expiry_duration.py deleted file mode 100644 index 6087340..0000000 --- a/inventory/migrations/0013_pantryitem_expiry_duration.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-27 17:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0012_auto_20180923_2037'), - ] - - operations = [ - migrations.AddField( - model_name='pantryitem', - name='expiry_duration', - field=models.DurationField(blank=True, null=True), - ), - ] diff --git a/inventory/migrations/0014_auto_20180930_1406.py b/inventory/migrations/0014_auto_20180930_1406.py deleted file mode 100644 index b7b217e..0000000 --- a/inventory/migrations/0014_auto_20180930_1406.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-30 14:06 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0013_pantryitem_expiry_duration'), - ] - - operations = [ - migrations.CreateModel( - name='Location', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(blank=True, max_length=200, null=True)), - ('in_location', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='inventory.Location')), - ], - ), - migrations.AlterField( - model_name='pantryitem', - name='expiry_duration', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='pantryitem', - name='location', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.Location'), - ), - ] diff --git a/inventory/migrations/0015_auto_20180930_1408.py b/inventory/migrations/0015_auto_20180930_1408.py deleted file mode 100644 index 58c3c48..0000000 --- a/inventory/migrations/0015_auto_20180930_1408.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-30 14:08 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0014_auto_20180930_1406'), - ] - - operations = [ - migrations.AlterField( - model_name='location', - name='in_location', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.Location'), - ), - ] diff --git a/inventory/migrations/0016_auto_20180930_1409.py b/inventory/migrations/0016_auto_20180930_1409.py deleted file mode 100644 index 3942a8d..0000000 --- a/inventory/migrations/0016_auto_20180930_1409.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.1 on 2018-09-30 14:09 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0015_auto_20180930_1408'), - ] - - operations = [ - migrations.AlterField( - model_name='location', - name='in_location', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.Location'), - ), - ] diff --git a/inventory/migrations/0017_auto_20181007_1108.py b/inventory/migrations/0017_auto_20181007_1108.py deleted file mode 100644 index e77a445..0000000 --- a/inventory/migrations/0017_auto_20181007_1108.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.1.2 on 2018-10-07 11:08 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0016_auto_20180930_1409'), - ] - - operations = [ - migrations.CreateModel( - name='ShoppingListItem', - fields=[ - ('pantryitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='inventory.PantryItem')), - ], - bases=('inventory.pantryitem',), - ), - migrations.AlterField( - model_name='pantryitem', - name='location', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.Location'), - ), - ] diff --git a/inventory/migrations/0018_auto_20181009_1032.py b/inventory/migrations/0018_auto_20181009_1032.py deleted file mode 100644 index 8a1a934..0000000 --- a/inventory/migrations/0018_auto_20181009_1032.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.2 on 2018-10-09 10:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0017_auto_20181007_1108'), - ] - - operations = [ - migrations.AlterField( - model_name='pantryitem', - name='category', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.Category'), - ), - ] diff --git a/inventory/migrations/__init__.py b/inventory/migrations/__init__.py deleted file mode 100644 index e69de29..0000000