Compare commits
12 Commits
4c43f87560
...
0.1.4
Author | SHA1 | Date | |
---|---|---|---|
163e9beb51 | |||
6ba225bee3 | |||
a4f80820c9 | |||
0f7b799c11 | |||
b23dc8a627 | |||
3e2ab1e12d | |||
78efe9bebb | |||
1de203ad40 | |||
399fa70ab6 | |||
c6a28c7b66 | |||
9980a2d190 | |||
1bc283bd8d |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -92,6 +92,3 @@ venv.bak/
|
|||||||
|
|
||||||
# twine / pypi
|
# twine / pypi
|
||||||
.pypirc
|
.pypirc
|
||||||
|
|
||||||
# Django Migrations for Development branches
|
|
||||||
django_lostplaces/lostplaces/migrations/*
|
|
||||||
|
5
Pipfile
5
Pipfile
@@ -14,6 +14,7 @@ pandoc = "*"
|
|||||||
pylint-django = "*"
|
pylint-django = "*"
|
||||||
setuptools = "*"
|
setuptools = "*"
|
||||||
django-nose = "*"
|
django-nose = "*"
|
||||||
|
invoke = "*"
|
||||||
|
|
||||||
[packages]
|
[packages]
|
||||||
django = "*"
|
django = "*"
|
||||||
@@ -30,3 +31,7 @@ showmigrations = "django_lostplaces/manage.py showmigrations"
|
|||||||
makemigrations = "django_lostplaces/manage.py makemigrations --no-input"
|
makemigrations = "django_lostplaces/manage.py makemigrations --no-input"
|
||||||
migrate = "django_lostplaces/manage.py migrate"
|
migrate = "django_lostplaces/manage.py migrate"
|
||||||
build = "django_lostplaces/setup.py bdist_wheel --universal"
|
build = "django_lostplaces/setup.py bdist_wheel --universal"
|
||||||
|
createsuperuser = "django_lostplaces/manage.py createsuperuser --noinput --username admin --email admin@example.org"
|
||||||
|
createsuperuser_prompt = "django_lostplaces/manage.py createsuperuser"
|
||||||
|
quickstart = "invoke quickstart"
|
||||||
|
security = "pipenv check"
|
17
Readme.md
17
Readme.md
@@ -35,7 +35,7 @@ Right now it depends on the following non-core Python 3 libraries. These can be
|
|||||||
|
|
||||||
# Installing a development instance
|
# Installing a development instance
|
||||||
## Clone the repository
|
## Clone the repository
|
||||||
`git clone https://git.mowoe.com/reverend/lostplaces-backend.git`
|
`git clone https://git.commander1024.de/Commander1024/lostplaces-backend`
|
||||||
## Setting up a (pipenv) virtual environment for development
|
## Setting up a (pipenv) virtual environment for development
|
||||||
|
|
||||||
After having obtained the repository contents (either via .zip download or git clone), you can easily setup a [pipenv](https://docs.pipenv.org/) virtual environment. The repo provides a Pipfile for easy dependency management that does not mess with your system.
|
After having obtained the repository contents (either via .zip download or git clone), you can easily setup a [pipenv](https://docs.pipenv.org/) virtual environment. The repo provides a Pipfile for easy dependency management that does not mess with your system.
|
||||||
@@ -65,6 +65,21 @@ Visit: [admin](http://localhost:8000/admin) for administrative backend or
|
|||||||
|
|
||||||
Happy developing ;-)
|
Happy developing ;-)
|
||||||
|
|
||||||
|
# Pipenv Scripts
|
||||||
|
This project comes with a bunch of convinient scripts, like:
|
||||||
|
|Script|Description|
|
||||||
|
|---|---|
|
||||||
|
|test|Runs the tests|
|
||||||
|
|server|Starts a **development** server|
|
||||||
|
|dbshell|Opens a shell session in the database|
|
||||||
|
|showmigrations|Lists all Migrations|
|
||||||
|
|makemigrations|Creates a migration|
|
||||||
|
|migrate|Applies unapplied migrations|
|
||||||
|
|build|Builds this project into a wheel file|
|
||||||
|
|createsuperuser|Creates a superuser with the username **admin** and the password **develop**. This is for development and demo instances only!
|
||||||
|
|quickstart|Runs *migrate*, *createsuperuser* and *server*|
|
||||||
|
|
||||||
|
|
||||||
# Installing a productive instance
|
# Installing a productive instance
|
||||||
|
|
||||||
Currently there are two ways to deploy the lostplaces project:
|
Currently there are two ways to deploy the lostplaces project:
|
||||||
|
@@ -35,3 +35,4 @@ admin.site.register(Voucher, VoucherAdmin)
|
|||||||
admin.site.register(Place, PlacesAdmin)
|
admin.site.register(Place, PlacesAdmin)
|
||||||
admin.site.register(PlaceImage, PlaceImagesAdmin)
|
admin.site.register(PlaceImage, PlaceImagesAdmin)
|
||||||
admin.site.register(PhotoAlbum, PhotoAlbumsAdmin)
|
admin.site.register(PhotoAlbum, PhotoAlbumsAdmin)
|
||||||
|
admin.site.register(PlaceVoting)
|
||||||
|
@@ -22,7 +22,7 @@ class SignupVoucherForm(UserCreationForm):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def is_valid(self):
|
def is_valid(self):
|
||||||
super().is_valid()
|
super_result = super().is_valid()
|
||||||
submitted_voucher = self.cleaned_data.get('voucher')
|
submitted_voucher = self.cleaned_data.get('voucher')
|
||||||
try:
|
try:
|
||||||
fetched_voucher = Voucher.objects.get(code=submitted_voucher)
|
fetched_voucher = Voucher.objects.get(code=submitted_voucher)
|
||||||
@@ -35,7 +35,7 @@ class SignupVoucherForm(UserCreationForm):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
fetched_voucher.delete()
|
fetched_voucher.delete()
|
||||||
return True
|
return super_result
|
||||||
|
|
||||||
class ExplorerUserChangeForm(UserChangeForm):
|
class ExplorerUserChangeForm(UserChangeForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@@ -1,118 +0,0 @@
|
|||||||
# Generated by Django 3.1.4 on 2020-12-25 16:02
|
|
||||||
|
|
||||||
import django.core.validators
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
|
||||||
import easy_thumbnails.fields
|
|
||||||
from lostplaces.models.models import generate_profile_image_filename
|
|
||||||
from lostplaces.models.place import generate_place_image_filename
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('lostplaces', '0003_voucher'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='explorer',
|
|
||||||
name='bio',
|
|
||||||
field=models.TextField(blank=True, help_text='Describe yourself, your preferences, etc. in a few sentences.', null=True, verbose_name='Biography / Description'),
|
|
||||||
),
|
|
||||||
# migrations.AddField(
|
|
||||||
# model_name='explorer',
|
|
||||||
# name='favorite_places',
|
|
||||||
# field=models.ManyToManyField(blank=True, related_name='explorer_favorites', to='lostplaces.Place', verbose_name='Explorers favorite places'),
|
|
||||||
# ),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='explorer',
|
|
||||||
name='profile_image',
|
|
||||||
field=easy_thumbnails.fields.ThumbnailerImageField(blank=True, help_text='Optional profile image for display in Explorer profile', null=True, upload_to=generate_profile_image_filename, verbose_name='Profile image'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='photoalbum',
|
|
||||||
name='label',
|
|
||||||
field=models.CharField(max_length=100, verbose_name='link text'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='photoalbum',
|
|
||||||
name='submitted_by',
|
|
||||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer', verbose_name='Submitter'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='photoalbum',
|
|
||||||
name='submitted_when',
|
|
||||||
field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='photoalbum',
|
|
||||||
name='url',
|
|
||||||
field=models.URLField(verbose_name='URL'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='place',
|
|
||||||
name='description',
|
|
||||||
field=models.TextField(help_text="Description of the place: e.g. how to get there, where to be careful, the place's history...", verbose_name='Description'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='place',
|
|
||||||
name='latitude',
|
|
||||||
field=models.FloatField(help_text='Latitude in decimal format: e. g. 41.40338', validators=[django.core.validators.MinValueValidator(-90), django.core.validators.MaxValueValidator(90)], verbose_name='Latitude'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='place',
|
|
||||||
name='location',
|
|
||||||
field=models.CharField(max_length=50, verbose_name='Location'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='place',
|
|
||||||
name='longitude',
|
|
||||||
field=models.FloatField(help_text='Longitude in decimal format: e. g. 2.17403', validators=[django.core.validators.MinValueValidator(-180), django.core.validators.MaxValueValidator(180)], verbose_name='Longitude'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='place',
|
|
||||||
name='name',
|
|
||||||
field=models.CharField(max_length=50, verbose_name='Name'),
|
|
||||||
),
|
|
||||||
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='lostplaces.explorer', verbose_name='Submitter'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='place',
|
|
||||||
name='submitted_when',
|
|
||||||
field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='placeimage',
|
|
||||||
name='description',
|
|
||||||
field=models.TextField(blank=True, verbose_name='Description'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='placeimage',
|
|
||||||
name='filename',
|
|
||||||
field=easy_thumbnails.fields.ThumbnailerImageField(help_text='Optional: One or more images to upload', upload_to=generate_place_image_filename, verbose_name='Filename(s)'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='placeimage',
|
|
||||||
name='submitted_by',
|
|
||||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer', verbose_name='Submitter'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='placeimage',
|
|
||||||
name='submitted_when',
|
|
||||||
field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='voucher',
|
|
||||||
name='created_when',
|
|
||||||
field=models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='voucher',
|
|
||||||
name='expires_when',
|
|
||||||
field=models.DateTimeField(verbose_name='Expiration date'),
|
|
||||||
),
|
|
||||||
]
|
|
@@ -1,18 +0,0 @@
|
|||||||
# Generated by Django 3.1.4 on 2020-12-25 18:14
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('lostplaces', '0004_gory_fix'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='explorer',
|
|
||||||
name='visited_places',
|
|
||||||
field=models.ManyToManyField(blank=True, related_name='explorer_visits', to='lostplaces.Place', verbose_name='Explorers visited places'),
|
|
||||||
),
|
|
||||||
]
|
|
@@ -0,0 +1,85 @@
|
|||||||
|
# Generated by Django 3.2.10 on 2021-12-31 17:20
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
import easy_thumbnails.fields
|
||||||
|
import lostplaces.models.models
|
||||||
|
import lostplaces.models.place
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('lostplaces', '0004_release_0_1_3'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='explorer',
|
||||||
|
name='bio',
|
||||||
|
field=models.TextField(blank=True, help_text='Describe yourself, your preferences, etc. in a few sentences.', null=True, verbose_name='Biography / Description'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='explorer',
|
||||||
|
name='favorite_places',
|
||||||
|
field=models.ManyToManyField(blank=True, related_name='explorer_favorites', to='lostplaces.Place', verbose_name='Explorers favorite places'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='explorer',
|
||||||
|
name='level',
|
||||||
|
field=models.IntegerField(choices=[(1, 'Newbie'), (2, 'Scout'), (3, 'Explorer'), (4, 'Journalist'), (5, 'Housekeeper')], default=1),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='explorer',
|
||||||
|
name='profile_image',
|
||||||
|
field=easy_thumbnails.fields.ThumbnailerImageField(blank=True, help_text='Optional profile image for display in Explorer profile', null=True, upload_to=lostplaces.models.generate_profile_image_filename, verbose_name='Profile image'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='explorer',
|
||||||
|
name='visited_places',
|
||||||
|
field=models.ManyToManyField(blank=True, related_name='explorer_visits', to='lostplaces.Place', verbose_name='Explorers visited places'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='place',
|
||||||
|
name='hero',
|
||||||
|
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='place_heros', to='lostplaces.placeimage'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='place',
|
||||||
|
name='level',
|
||||||
|
field=models.IntegerField(choices=[(1, 'Ruin'), (2, 'Vandalized'), (3, 'Natures Treasure'), (4, 'Lost in History'), (5, 'Time Capsule')], default=5),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='placeimage',
|
||||||
|
name='filename',
|
||||||
|
field=easy_thumbnails.fields.ThumbnailerImageField(help_text='Optional: One or more images to upload', upload_to=lostplaces.models.place.generate_place_image_filename, verbose_name='Images'),
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='PlaceVoting',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')),
|
||||||
|
('created_when', models.DateTimeField(auto_now_add=True, verbose_name='Creation date')),
|
||||||
|
('expires_when', models.DateTimeField(verbose_name='Expiration date')),
|
||||||
|
('vote', models.IntegerField(choices=[(1, 'Ruin'), (2, 'Vandalized'), (3, 'Natures Treasure'), (4, 'Lost in History'), (5, 'Time Capsule')])),
|
||||||
|
('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='placevotings', to='lostplaces.place')),
|
||||||
|
('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placevotings', to='lostplaces.explorer', verbose_name='Submitter')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='DummyAsset',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')),
|
||||||
|
('name', models.CharField(max_length=50)),
|
||||||
|
('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='dummyassets', to='lostplaces.place')),
|
||||||
|
('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dummyassets', to='lostplaces.explorer', verbose_name='Submitter')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
@@ -1,14 +0,0 @@
|
|||||||
# Generated by Django 3.2.5 on 2021-07-16 11:15
|
|
||||||
|
|
||||||
from django.db import migrations
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('lostplaces', '0004_release_0_1_3'),
|
|
||||||
('lostplaces', '0005_add_visited_places'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
]
|
|
@@ -1,4 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
|
from math import floor
|
||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
@@ -6,7 +7,7 @@ from django.dispatch import receiver
|
|||||||
from django.db.models.signals import post_delete, pre_save
|
from django.db.models.signals import post_delete, pre_save
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from lostplaces.models.abstract_models import Submittable, Taggable, Mapable
|
from lostplaces.models.abstract_models import Submittable, Taggable, Mapable, Expireable
|
||||||
|
|
||||||
from easy_thumbnails.fields import ThumbnailerImageField
|
from easy_thumbnails.fields import ThumbnailerImageField
|
||||||
from easy_thumbnails.files import get_thumbnailer
|
from easy_thumbnails.files import get_thumbnailer
|
||||||
@@ -15,7 +16,7 @@ PLACE_LEVELS = (
|
|||||||
(1, 'Ruin'),
|
(1, 'Ruin'),
|
||||||
(2, 'Vandalized'),
|
(2, 'Vandalized'),
|
||||||
(3, 'Natures Treasure'),
|
(3, 'Natures Treasure'),
|
||||||
(4, 'Long Time no See'),
|
(4, 'Lost in History'),
|
||||||
(5, 'Time Capsule')
|
(5, 'Time Capsule')
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -58,10 +59,15 @@ class Place(Submittable, Taggable, Mapable):
|
|||||||
return reverse('place_detail', kwargs={'pk': self.pk})
|
return reverse('place_detail', kwargs={'pk': self.pk})
|
||||||
|
|
||||||
def get_hero_index_in_queryset(self):
|
def get_hero_index_in_queryset(self):
|
||||||
|
'''
|
||||||
|
Calculates the index of the hero image within
|
||||||
|
the list / queryset of images. Necessary for
|
||||||
|
the lightbox.
|
||||||
|
'''
|
||||||
for i in range(0, len(self.placeimages.all())):
|
for i in range(0, len(self.placeimages.all())):
|
||||||
image = self.placeimages.all()[i]
|
image = self.placeimages.all()[i]
|
||||||
if image == self.hero:
|
if image == self.hero:
|
||||||
return i
|
return i
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
@@ -84,6 +90,27 @@ class Place(Submittable, Taggable, Mapable):
|
|||||||
|
|
||||||
return {'latitude': latitude, 'longitude': longitude}
|
return {'latitude': latitude, 'longitude': longitude}
|
||||||
|
|
||||||
|
def calculate_place_level(self):
|
||||||
|
self.remove_expired_votes()
|
||||||
|
|
||||||
|
if self.placevotings.count() == 0:
|
||||||
|
self.level = 5
|
||||||
|
self.save()
|
||||||
|
return
|
||||||
|
|
||||||
|
level = 0
|
||||||
|
|
||||||
|
for vote in self.placevotings.all():
|
||||||
|
level += vote.vote
|
||||||
|
|
||||||
|
self.level = floor(level / self.placevotings.count())
|
||||||
|
self.save()
|
||||||
|
|
||||||
|
def remove_expired_votes(self):
|
||||||
|
for vote in self.placevotings.all():
|
||||||
|
if vote.is_expired:
|
||||||
|
vote.delete()
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
@@ -104,7 +131,7 @@ class PlaceAsset(Submittable):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
abstract = True
|
abstract = True
|
||||||
|
|
||||||
place = models.ForeignKey(
|
place = models.ForeignKey(
|
||||||
Place,
|
Place,
|
||||||
@@ -180,3 +207,13 @@ def auto_delete_file_on_change(sender, instance, **kwargs):
|
|||||||
new_file = instance.filename
|
new_file = instance.filename
|
||||||
if not old_file == new_file:
|
if not old_file == new_file:
|
||||||
old_file.delete(save=False)
|
old_file.delete(save=False)
|
||||||
|
|
||||||
|
|
||||||
|
class PlaceVoting(PlaceAsset, Expireable):
|
||||||
|
vote = models.IntegerField(choices=PLACE_LEVELS)
|
||||||
|
|
||||||
|
def get_human_readable_level(self):
|
||||||
|
return PLACE_LEVELS[self.vote - 1][1]
|
||||||
|
|
||||||
|
def get_all_choices(self):
|
||||||
|
return reversed(PLACE_LEVELS)
|
@@ -0,0 +1,202 @@
|
|||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
19116
django_lostplaces/lostplaces/static/materialdesignicons.css
Normal file
19116
django_lostplaces/lostplaces/static/materialdesignicons.css
Normal file
File diff suppressed because it is too large
Load Diff
@@ -12,6 +12,7 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<link rel="stylesheet" href="{% static 'main.css' %}">
|
<link rel="stylesheet" href="{% static 'main.css' %}">
|
||||||
|
<link rel="stylesheet" href="{% static 'materialdesignicons.css' %}">
|
||||||
<link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
|
<link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
|
||||||
<title>
|
<title>
|
||||||
{% block title %}Urban Exploration{% endblock %}
|
{% block title %}Urban Exploration{% endblock %}
|
||||||
|
41
django_lostplaces/lostplaces/templates/partials/voting.html
Normal file
41
django_lostplaces/lostplaces/templates/partials/voting.html
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
<div class="LP-Voting">
|
||||||
|
<div class="LP-Voting__Left">
|
||||||
|
<h2 class="LP-Headline">
|
||||||
|
Place level
|
||||||
|
</h2>
|
||||||
|
<div class="LP-Voting__Choices">
|
||||||
|
{% for choice in voting.all_choices %}
|
||||||
|
<a href="{% url 'place_vote' place_id=place.id vote=choice.0 %}" class="LP-Voting__Vote {% if choice.0 <= place.level %} LP-Voting__Vote--overall{% endif %}" title="Vote place as "{{choice.1}}"">
|
||||||
|
<i class="mdi mdi-shield-home"></i>
|
||||||
|
<span class="LP-Voting__Label">
|
||||||
|
{{choice.1}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
<div class="LP-Voting__CurrentVote">
|
||||||
|
{{place.get_level_display}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% if voting.users_vote %}
|
||||||
|
<div class="LP-Voting__Right">
|
||||||
|
<div class="LP-Voting__Info">
|
||||||
|
<div class="LP-Voting__UserVote">
|
||||||
|
<span class="LP-Voting__InfoLabel">You voted this place as</span>
|
||||||
|
<span class="LP-Voting__Vote">{{voting.users_vote.get_human_readable_level}} <i>Level {{voting.users_vote.vote}}</i></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="LP-Voting__Expiration">
|
||||||
|
<span class="LP-Voting__InfoLabel">Your vote expires on</span>
|
||||||
|
<span class="LP-Voting__Date">
|
||||||
|
<time datetime="{{voting.expires_when|date:'Y-m-d'}}">
|
||||||
|
{{voting.users_vote.expires_when|date:'d.m.Y'}}
|
||||||
|
</time>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
@@ -40,25 +40,64 @@
|
|||||||
<p class="LP-Paragraph">{{ place.description }}</p>
|
<p class="LP-Paragraph">{{ place.description }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section class="LP-Section">
|
<div class="LP-Quickinfo">
|
||||||
|
<section class="LP-Section">
|
||||||
{% url 'place_tag_submit' place_id=place.id as tag_submit_url%}
|
{% url 'place_tag_submit' place_id=place.id as tag_submit_url %}
|
||||||
{% partial tagging %}
|
{% partial tagging %}
|
||||||
{% set config=tagging_config %}
|
{% set config=tagging_config %}
|
||||||
{% endpartial %}
|
{% endpartial %}
|
||||||
|
</section>
|
||||||
</section>
|
|
||||||
|
{{votingplace.vote}}
|
||||||
|
<section class="LP-Section">
|
||||||
|
{% partial voting %}
|
||||||
|
{% set place=place %}
|
||||||
|
{% set voting=placevoting %}
|
||||||
|
{% endpartial %}
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
|
||||||
<section class="LP-Section">
|
<section class="LP-Section">
|
||||||
<h1 class="LP-Headline">{% translate 'Map links' %}</h1>
|
<h1 class="LP-Headline">{% translate 'Map links' %}</h1>
|
||||||
{% partial osm_map config=mapping_config %}
|
{% partial osm_map config=mapping_config %}
|
||||||
<div class="LP-LinkList">
|
<ul class="LP-LinkList">
|
||||||
<ul class="LP-LinkList__Container">
|
<li class="LP-LinkList__Item">
|
||||||
<li class="LP-LinkList__Item"><a target="_blank" href="https://www.google.com/maps?q={{place.latitude|safe}},{{place.longitude|safe}}" class="LP-Link"><span class="LP-Text">Google Maps</span></a></li>
|
<a target="_blank" href="https://www.google.com/maps?q={{place.latitude|safe}},{{place.longitude|safe}}" class="LP-Link">
|
||||||
<li class="LP-LinkList__Item"><a target="_blank" href="https://www.tim-online.nrw.de/tim-online2/?center={{place.latitude|safe}},{{place.longitude|safe}}&icon=true&bg=dop" class="LP-Link"><span class="LP-Text">TIM Online</span></a></li>
|
<span class="LP-Text RV-Iconized">
|
||||||
<li class="LP-LinkList__Item"><a target="_blank" href="http://www.openstreetmap.org/?mlat={{place.latitude|safe}}&mlon={{place.longitude|safe}}&zoom=16" class="LP-Link"><span class="LP-Text">OSM</span></a></li>
|
<span class="RV-Iconized__Text">
|
||||||
</ul>
|
Google Maps
|
||||||
</div>
|
</span>
|
||||||
|
<span class="RV-Iconized__Icon RV-Iconized__Icon--left">
|
||||||
|
<i class="mdi mdi-map-outline"></i>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="LP-LinkList__Item">
|
||||||
|
<a target="_blank" href="https://www.tim-online.nrw.de/tim-online2/?center={{place.latitude|safe}},{{place.longitude|safe}}&icon=true&bg=dop" class="LP-Link">
|
||||||
|
<span class="LP-Text RV-Iconized">
|
||||||
|
<span class="RV-Iconized__Text">
|
||||||
|
TIM Online
|
||||||
|
</span>
|
||||||
|
<span class="RV-Iconized__Icon RV-Iconized__Icon--left">
|
||||||
|
<i class="mdi mdi-map-outline"></i>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="LP-LinkList__Item">
|
||||||
|
<a target="_blank" href="http://www.openstreetmap.org/?mlat={{place.latitude|safe}}&mlon={{place.longitude|safe}}&zoom=16" class="LP-Link">
|
||||||
|
<span class="LP-Text RV-Iconized">
|
||||||
|
<span class="RV-Iconized__Text">
|
||||||
|
OSM
|
||||||
|
</span>
|
||||||
|
<span class="RV-Iconized__Icon RV-Iconized__Icon--left">
|
||||||
|
<i class="mdi mdi-map-outline"></i>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class=" LP-Section">
|
<section class=" LP-Section">
|
||||||
|
@@ -14,7 +14,6 @@ from lostplaces.tests.views import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
class TestHomeView(GlobalTemplateTestCaseMixin, ViewTestCase):
|
class TestHomeView(GlobalTemplateTestCaseMixin, ViewTestCase):
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def setUpTestData(cls):
|
def setUpTestData(cls):
|
||||||
user = User.objects.create_user(
|
user = User.objects.create_user(
|
||||||
@@ -33,6 +32,32 @@ class TestHomeView(GlobalTemplateTestCaseMixin, ViewTestCase):
|
|||||||
)
|
)
|
||||||
place.tags.add('I a tag', 'testlocation')
|
place.tags.add('I a tag', 'testlocation')
|
||||||
place.save()
|
place.save()
|
||||||
|
|
||||||
|
# Creating a place with level one to test against
|
||||||
|
# unauth's users and users with level 1
|
||||||
|
Place.objects.create(
|
||||||
|
name='Im a place level 1',
|
||||||
|
submitted_when=timezone.now(),
|
||||||
|
submitted_by=user.explorer,
|
||||||
|
location='Testtown',
|
||||||
|
latitude=50.5,
|
||||||
|
longitude=7.0,
|
||||||
|
description='This is just a test, do not worry',
|
||||||
|
level=1
|
||||||
|
)
|
||||||
|
|
||||||
|
# Creating a place with level two to test against
|
||||||
|
# unauth's users and users above level 1
|
||||||
|
Place.objects.create(
|
||||||
|
name='Im a place level 2',
|
||||||
|
submitted_when=timezone.now(),
|
||||||
|
submitted_by=user.explorer,
|
||||||
|
location='Testtown',
|
||||||
|
latitude=50.5,
|
||||||
|
longitude=7.0,
|
||||||
|
description='This is just a test, do not worry',
|
||||||
|
level=2
|
||||||
|
)
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.client = Client()
|
self.client = Client()
|
||||||
@@ -80,7 +105,26 @@ class TestHomeView(GlobalTemplateTestCaseMixin, ViewTestCase):
|
|||||||
),
|
),
|
||||||
msg='Expecting the test place to show up on the homepage'
|
msg='Expecting the test place to show up on the homepage'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
print(response.content.decode().replace('\n', ''))
|
||||||
|
self.assertNotEqual(
|
||||||
|
None,
|
||||||
|
re.search(
|
||||||
|
"""Im a place level 1""",
|
||||||
|
response.content.decode().replace('\n', '')
|
||||||
|
),
|
||||||
|
msg="Expecting the level 1 places to show up on the homepage publicly"
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
None,
|
||||||
|
re.search(
|
||||||
|
"""Im a place level 2""",
|
||||||
|
response.content.decode().replace('\n', '')
|
||||||
|
),
|
||||||
|
msg="Expecting the level 2 places to *not* show up on the homepage publicly"
|
||||||
|
)
|
||||||
|
|
||||||
def test_map_authenticated(self):
|
def test_map_authenticated(self):
|
||||||
"""
|
"""
|
||||||
Testing there is a map showing all the lates places
|
Testing there is a map showing all the lates places
|
||||||
|
@@ -22,7 +22,8 @@ from lostplaces.views import (
|
|||||||
PhotoAlbumCreateView,
|
PhotoAlbumCreateView,
|
||||||
PhotoAlbumDeleteView,
|
PhotoAlbumDeleteView,
|
||||||
ExplorerProfileView,
|
ExplorerProfileView,
|
||||||
ExplorerProfileUpdateView
|
ExplorerProfileUpdateView,
|
||||||
|
PlaceVoteView
|
||||||
)
|
)
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
@@ -47,6 +48,8 @@ urlpatterns = [
|
|||||||
|
|
||||||
path('place_image/create/<int:place_id>/', PlaceImageCreateView.as_view(), name='place_image_create'),
|
path('place_image/create/<int:place_id>/', PlaceImageCreateView.as_view(), name='place_image_create'),
|
||||||
path('place_image/delete/<int:pk>/', PlaceImageDeleteView.as_view(), name='place_image_delete'),
|
path('place_image/delete/<int:pk>/', PlaceImageDeleteView.as_view(), name='place_image_delete'),
|
||||||
|
|
||||||
|
path('place/vote/<int:place_id>/<int:vote>', PlaceVoteView.as_view(), name='place_vote'),
|
||||||
|
|
||||||
path('photo_album/create/<int:place_id>/', PhotoAlbumCreateView.as_view(), name='photo_album_create'),
|
path('photo_album/create/<int:place_id>/', PhotoAlbumCreateView.as_view(), name='photo_album_create'),
|
||||||
path('photo_album/delete/<int:pk>/', PhotoAlbumDeleteView.as_view(), name='photo_album_delete')
|
path('photo_album/delete/<int:pk>/', PhotoAlbumDeleteView.as_view(), name='photo_album_delete')
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
from django.db.models.functions import Lower
|
from django.db.models.functions import Lower
|
||||||
|
|
||||||
@@ -10,11 +11,18 @@ from django.views.generic.detail import SingleObjectMixin
|
|||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.contrib.messages.views import SuccessMessageMixin
|
from django.contrib.messages.views import SuccessMessageMixin
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
from django.utils import timezone
|
||||||
|
|
||||||
from django.shortcuts import render, redirect, get_object_or_404
|
from django.shortcuts import render, redirect, get_object_or_404
|
||||||
from django.urls import reverse_lazy, reverse
|
from django.urls import reverse_lazy, reverse
|
||||||
|
|
||||||
from lostplaces.models import Place, PlaceImage
|
from lostplaces.models import (
|
||||||
|
Place,
|
||||||
|
PlaceImage,
|
||||||
|
PlaceVoting,
|
||||||
|
PLACE_LEVELS
|
||||||
|
)
|
||||||
|
|
||||||
from lostplaces.views.base_views import (
|
from lostplaces.views.base_views import (
|
||||||
IsAuthenticatedMixin,
|
IsAuthenticatedMixin,
|
||||||
IsPlaceSubmitterMixin,
|
IsPlaceSubmitterMixin,
|
||||||
@@ -46,8 +54,10 @@ class PlaceDetailView(IsAuthenticatedMixin, IsEligibleToSeePlaceMixin, View):
|
|||||||
def get_place(self):
|
def get_place(self):
|
||||||
return get_object_or_404(Place, pk=self.kwargs['pk'])
|
return get_object_or_404(Place, pk=self.kwargs['pk'])
|
||||||
|
|
||||||
def get(self, request, pk):
|
def get(self, request, pk):
|
||||||
place = self.get_place()
|
place = self.get_place()
|
||||||
|
place.calculate_place_level()
|
||||||
|
explorer = request.user.explorer
|
||||||
|
|
||||||
context = {
|
context = {
|
||||||
'place': place,
|
'place': place,
|
||||||
@@ -61,6 +71,10 @@ class PlaceDetailView(IsAuthenticatedMixin, IsEligibleToSeePlaceMixin, View):
|
|||||||
'tagged_item': place,
|
'tagged_item': place,
|
||||||
'submit_url': reverse('place_tag_submit', kwargs={'tagged_id': place.id}),
|
'submit_url': reverse('place_tag_submit', kwargs={'tagged_id': place.id}),
|
||||||
'delete_url_name': 'place_tag_delete'
|
'delete_url_name': 'place_tag_delete'
|
||||||
|
},
|
||||||
|
'placevoting': {
|
||||||
|
'users_vote': PlaceVoting.objects.filter(place=place, submitted_by=explorer).first(),
|
||||||
|
'all_choices': reversed(PLACE_LEVELS)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return render(request, 'place/place_detail.html', context)
|
return render(request, 'place/place_detail.html', context)
|
||||||
@@ -185,3 +199,32 @@ class PlaceVisitDeleteView(IsAuthenticatedMixin, View):
|
|||||||
request.user.explorer.save()
|
request.user.explorer.save()
|
||||||
|
|
||||||
return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place.pk}))
|
return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place.pk}))
|
||||||
|
|
||||||
|
|
||||||
|
class PlaceVoteView(IsEligibleToSeePlaceMixin, View):
|
||||||
|
delta = timedelta(weeks=24)
|
||||||
|
|
||||||
|
def get(self, request, place_id, vote):
|
||||||
|
place = get_object_or_404(Place, id=place_id)
|
||||||
|
explorer = request.user.explorer
|
||||||
|
|
||||||
|
voting = PlaceVoting.objects.filter(
|
||||||
|
submitted_by=explorer,
|
||||||
|
place=place
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if voting is None:
|
||||||
|
voting = PlaceVoting.objects.create(
|
||||||
|
submitted_by=explorer,
|
||||||
|
place=place,
|
||||||
|
vote=vote,
|
||||||
|
expires_when=timezone.now()+self.delta
|
||||||
|
)
|
||||||
|
messages.success(self.request, _('Vote submitted'))
|
||||||
|
else:
|
||||||
|
voting.expires_when=timezone.now()+self.delta
|
||||||
|
voting.vote = vote
|
||||||
|
messages.success(self.request, _('Your vote has been update'))
|
||||||
|
|
||||||
|
voting.save()
|
||||||
|
return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place.pk}))
|
@@ -42,7 +42,7 @@ class HomeView(IsAuthenticatedMixin, View):
|
|||||||
return render(request, 'home.html', context)
|
return render(request, 'home.html', context)
|
||||||
|
|
||||||
def handle_no_permission(self):
|
def handle_no_permission(self):
|
||||||
place_list = Place.objects.all().order_by('-submitted_when')[:5]
|
place_list = Place.objects.filter(level=1)[:5]
|
||||||
context = {
|
context = {
|
||||||
'place_list': place_list
|
'place_list': place_list
|
||||||
}
|
}
|
||||||
|
@@ -6,9 +6,11 @@ from setuptools import setup, find_packages
|
|||||||
with open('Readme.md') as f:
|
with open('Readme.md') as f:
|
||||||
readme = f.read()
|
readme = f.read()
|
||||||
|
|
||||||
|
# Keep PEP 440 for version identification in mind
|
||||||
|
# https://www.python.org/dev/peps/pep-0440/#post-releases
|
||||||
setup(
|
setup(
|
||||||
name='django-lostplaces',
|
name='django-lostplaces',
|
||||||
version='0.1.3',
|
version='0.1.4.post1',
|
||||||
description='A django app to manage lost places',
|
description='A django app to manage lost places',
|
||||||
author='Reverend',
|
author='Reverend',
|
||||||
author_email='reverend@reverend2048.de',
|
author_email='reverend@reverend2048.de',
|
||||||
@@ -33,4 +35,4 @@ setup(
|
|||||||
],
|
],
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
license='MIT'
|
license='MIT'
|
||||||
)
|
)
|
21
tasks.py
Normal file
21
tasks.py
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
from invoke import task
|
||||||
|
|
||||||
|
@task
|
||||||
|
def quickstart(c):
|
||||||
|
commands = [
|
||||||
|
'pipenv run migrate',
|
||||||
|
'pipenv run createsuperuser',
|
||||||
|
'pipenv run server'
|
||||||
|
]
|
||||||
|
c.run(' && '.join(commands))
|
||||||
|
|
||||||
|
@task
|
||||||
|
def live(c):
|
||||||
|
commands = [
|
||||||
|
'pipenv check',
|
||||||
|
'pipenv run test',
|
||||||
|
'pipenv run migrate',
|
||||||
|
'pipenv run createsuperuser_prompt'
|
||||||
|
'pipenv run server'
|
||||||
|
]
|
||||||
|
c.run(' && '.join(commands))
|
Reference in New Issue
Block a user