diff --git a/.gitignore b/.gitignore index b3940c6..500072e 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,10 @@ coverage.xml *.mo # Django stuff: +# exclude migrations from repository. These should be created locally, matching local DB requirements. +# lostplaces/manage.py makemigrations && lostplaces/manage.py migrate + +lostplaces/lostplaces_app/migrations/ # pyenv .python-version diff --git a/lostplaces/lostplaces_app/migrations/0001_initial.py b/lostplaces/lostplaces_app/migrations/0001_initial.py deleted file mode 100644 index 849b522..0000000 --- a/lostplaces/lostplaces_app/migrations/0001_initial.py +++ /dev/null @@ -1,67 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-28 19:00 - -import django.contrib.auth.models -import django.contrib.auth.validators -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import django_thumbs.fields -import lostplaces_app.models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0011_update_proxy_permissions'), - ] - - operations = [ - migrations.CreateModel( - name='Place', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50)), - ('location', models.CharField(max_length=50)), - ('latitude', models.FloatField()), - ('longitude', models.FloatField()), - ('description', models.TextField()), - ], - ), - migrations.CreateModel( - name='PlaceImage', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('filename', django_thumbs.fields.ImageThumbsField(max_length=50, sizes=({'code': 'thumbnail', 'wxh': '390x390'}, {'code': 'hero', 'wxh': '700x700'}, {'code': 'large', 'wxh': '1920x1920'}), upload_to=lostplaces_app.models.generate_image_upload_path)), - ('description', models.TextField(blank=True)), - ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='lostplaces_app.Place')), - ], - ), - migrations.CreateModel( - name='Explorer', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), - ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), - ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), - ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), - ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), - ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), - ], - options={ - 'verbose_name': 'user', - 'verbose_name_plural': 'users', - 'abstract': False, - }, - managers=[ - ('objects', django.contrib.auth.models.UserManager()), - ], - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0002_place_submitted_by.py b/lostplaces/lostplaces_app/migrations/0002_place_submitted_by.py deleted file mode 100644 index 8fc80ff..0000000 --- a/lostplaces/lostplaces_app/migrations/0002_place_submitted_by.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-29 16:29 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='place', - name='submitted_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0003_auto_20200729_1822.py b/lostplaces/lostplaces_app/migrations/0003_auto_20200729_1822.py deleted file mode 100644 index 6d0ad16..0000000 --- a/lostplaces/lostplaces_app/migrations/0003_auto_20200729_1822.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-29 18:22 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0002_place_submitted_by'), - ] - - operations = [ - migrations.AlterField( - model_name='place', - name='submitted_by', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0004_placeimage_submitted_by.py b/lostplaces/lostplaces_app/migrations/0004_placeimage_submitted_by.py deleted file mode 100644 index 34bb878..0000000 --- a/lostplaces/lostplaces_app/migrations/0004_placeimage_submitted_by.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-30 09:18 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0003_auto_20200729_1822'), - ] - - operations = [ - migrations.AddField( - model_name='placeimage', - name='submitted_by', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0005_voucher.py b/lostplaces/lostplaces_app/migrations/0005_voucher.py deleted file mode 100644 index 323451f..0000000 --- a/lostplaces/lostplaces_app/migrations/0005_voucher.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.8 on 2020-08-01 10:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0004_placeimage_submitted_by'), - ] - - operations = [ - migrations.CreateModel( - name='Voucher', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=10)), - ('created', models.DateField(auto_now_add=True)), - ('expires', models.DateField()), - ], - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0006_auto_20200801_1037.py b/lostplaces/lostplaces_app/migrations/0006_auto_20200801_1037.py deleted file mode 100644 index f850cb3..0000000 --- a/lostplaces/lostplaces_app/migrations/0006_auto_20200801_1037.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.8 on 2020-08-01 10:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0005_voucher'), - ] - - operations = [ - migrations.RemoveField( - model_name='voucher', - name='id', - ), - migrations.AlterField( - model_name='voucher', - name='code', - field=models.CharField(max_length=10, primary_key=True, serialize=False, unique=True), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0007_auto_20200801_1039.py b/lostplaces/lostplaces_app/migrations/0007_auto_20200801_1039.py deleted file mode 100644 index 93974fa..0000000 --- a/lostplaces/lostplaces_app/migrations/0007_auto_20200801_1039.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-08-01 10:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0006_auto_20200801_1037'), - ] - - operations = [ - migrations.AlterField( - model_name='voucher', - name='created', - field=models.DateTimeField(auto_now_add=True), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0008_auto_20200801_1044.py b/lostplaces/lostplaces_app/migrations/0008_auto_20200801_1044.py deleted file mode 100644 index 8161acb..0000000 --- a/lostplaces/lostplaces_app/migrations/0008_auto_20200801_1044.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.0.8 on 2020-08-01 10:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0007_auto_20200801_1039'), - ] - - operations = [ - migrations.AddField( - model_name='voucher', - name='id', - field=models.AutoField(auto_created=True, default=0, primary_key=True, serialize=False, verbose_name='ID'), - preserve_default=False, - ), - migrations.AlterField( - model_name='voucher', - name='code', - field=models.CharField(max_length=10, unique=True), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py b/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py deleted file mode 100644 index 44a6ff9..0000000 --- a/lostplaces/lostplaces_app/migrations/0009_place_submitted_when.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.9 on 2020-08-03 16:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0008_auto_20200801_1044'), - ] - - operations = [ - migrations.AddField( - model_name='place', - name='submitted_when', - field=models.DateTimeField(auto_now_add=True, null=True), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py b/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py deleted file mode 100644 index 186860e..0000000 --- a/lostplaces/lostplaces_app/migrations/0010_auto_20200803_1707.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.9 on 2020-08-03 17:07 - -from django.db import migrations -import easy_thumbnails.fields -import lostplaces_app.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0009_place_submitted_when'), - ] - - operations = [ - migrations.AlterField( - model_name='placeimage', - name='filename', - field=easy_thumbnails.fields.ThumbnailerImageField(upload_to=lostplaces_app.models.generate_image_upload_path), - ), - ] diff --git a/lostplaces/lostplaces_app/migrations/__init__.py b/lostplaces/lostplaces_app/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/lostplaces/lostplaces_app/templates/global.html b/lostplaces/lostplaces_app/templates/global.html index 0140f25..97038f7 100644 --- a/lostplaces/lostplaces_app/templates/global.html +++ b/lostplaces/lostplaces_app/templates/global.html @@ -8,89 +8,89 @@ {% block title %}Urban Exploration{% endblock %} - - - {% block additional_head %} - {% endblock additional_head %} + + + {% block additional_head %} + {% endblock additional_head %} - - + + -
-
- -
- - {% if user.is_authenticated %} - Hi {{ user.username }}! - logout - {% if user.is_superuser %} - | admin - {% endif %} - - {% else %} - You are not logged in. - login | - signup - {% endif %} - -
-
- - - -
- {% if messages %} -
-
    - {% for message in messages %} -
  • -
    -
    -
    -
    -
    -
    - {{ message }} -
    -
    -
    • - {% endfor %} -
-
- {% endif %} - {% block maincontent %} - {% endblock maincontent %} -
-
+
+
+ +
+ + {% if user.is_authenticated %} + Hi {{ user.username }}! + logout + {% if user.is_superuser %} + | admin + {% endif %} + + {% else %} + You are not logged in. + login | + signup + {% endif %} + +
+
+ + + +
+ {% if messages %} +
+
    + {% for message in messages %} +
  • +
    +
    +
    +
    +
    +
    + {{ message }} +
    +
    +
    • + {% endfor %} +
+
+ {% endif %} + {% block maincontent %} + {% endblock maincontent %} +
+
\ No newline at end of file diff --git a/lostplaces/lostplaces_app/templates/partials/nav/pagination.html b/lostplaces/lostplaces_app/templates/partials/nav/pagination.html index 2bda9cf..04acd41 100644 --- a/lostplaces/lostplaces_app/templates/partials/nav/pagination.html +++ b/lostplaces/lostplaces_app/templates/partials/nav/pagination.html @@ -3,59 +3,71 @@ {% if is_paginated %}
diff --git a/lostplaces/lostplaces_app/templates/place/place_create.html b/lostplaces/lostplaces_app/templates/place/place_create.html index ddaca85..d085629 100644 --- a/lostplaces/lostplaces_app/templates/place/place_create.html +++ b/lostplaces/lostplaces_app/templates/place/place_create.html @@ -38,16 +38,16 @@ -
-
- -
-
- - - -
-
+
+
+ +
+
+ + + +
+
diff --git a/lostplaces/lostplaces_app/templates/place/place_delete.html b/lostplaces/lostplaces_app/templates/place/place_delete.html index cdae9aa..f23895f 100644 --- a/lostplaces/lostplaces_app/templates/place/place_delete.html +++ b/lostplaces/lostplaces_app/templates/place/place_delete.html @@ -9,22 +9,22 @@
Delete place {% csrf_token %} -
-
-

Are you sure you want to delete "{{place.name}}"?

-
-
+
+
+

Are you sure you want to delete "{{place.name}}"?

+
+
-
-
- -
-
- - - -
-
+
+
+ +
+
+ + + +
+
{% endblock maincontent %} diff --git a/lostplaces/lostplaces_app/templates/place/place_detail.html b/lostplaces/lostplaces_app/templates/place/place_detail.html index b94c5fe..71ce78f 100644 --- a/lostplaces/lostplaces_app/templates/place/place_detail.html +++ b/lostplaces/lostplaces_app/templates/place/place_detail.html @@ -5,20 +5,20 @@ {% block title %}{{place.name}}{% endblock %} {% block additional_menu_items %} -
  • Edit place
    • -
  • Delete place
    • +
  • Edit place
    • +
  • Delete place
    • {% endblock additional_menu_items %} - + {% block maincontent %}
    -

    {{ place.name }}

    - {% if place.images.first.filename.hero.url %} -
    - -
    - {% endif %} +

    {{ place.name }}

    + {% if place.images.first.filename.hero.url %} +
    + +
    + {% endif %}
    @@ -29,25 +29,25 @@

    Map-Links

    - - + +

    Bilder

      - {% for place_image in place.images.all %} -
    • - -
      • - {% endfor %} + {% for place_image in place.images.all %} +
    • + +
      • + {% endfor %}
    -
    - + +
    {% endblock maincontent %} \ No newline at end of file diff --git a/lostplaces/lostplaces_app/templates/place/place_update.html b/lostplaces/lostplaces_app/templates/place/place_update.html index d5f6059..5d274f6 100644 --- a/lostplaces/lostplaces_app/templates/place/place_update.html +++ b/lostplaces/lostplaces_app/templates/place/place_update.html @@ -37,17 +37,17 @@ {% include 'partials/form/inputField.html' with field=form.filename %} - -
    -
    - -
    -
    - - - -
    -
    + +
    +
    + +
    +
    + + + +
    +
    diff --git a/lostplaces/templates/403.html b/lostplaces/templates/403.html index 7c3b767..3e56fb0 100644 --- a/lostplaces/templates/403.html +++ b/lostplaces/templates/403.html @@ -4,12 +4,12 @@ {% block additional_head %} {% if request.META.HTTP_REFERER %} - + {% endif %} {% endblock additional_head %} {% block maincontent %} {% if request.META.HTTP_REFERER %} -

    You will be redirected in 5 seconds

    Go Back

    +

    You will be redirected in 5 seconds

    Go Back

    {% endif %} {% endblock maincontent %} \ No newline at end of file diff --git a/lostplaces/templates/registration/login.html b/lostplaces/templates/registration/login.html index bbd6d63..c2c2211 100644 --- a/lostplaces/templates/registration/login.html +++ b/lostplaces/templates/registration/login.html @@ -18,12 +18,12 @@ -
    -
    - -
    -
    - +
    +
    + +
    +
    + diff --git a/lostplaces/templates/signup.html b/lostplaces/templates/signup.html index 4787602..517989e 100644 --- a/lostplaces/templates/signup.html +++ b/lostplaces/templates/signup.html @@ -35,11 +35,11 @@ -
    -
    - -
    -
    +
    +
    + +
    +