ГОРОД
@@ -250,4 +259,11 @@ var openFile = function(file) {
reader.readAsDataURL(input.files[0]);
};
-{% endblock content %}
\ No newline at end of file
+
+{% endblock content %}
+
+{% block foot %}
+
+{% endblock foot %}
\ No newline at end of file
diff --git a/apps/user/views.py b/apps/user/views.py
index 69e42bef..d98bcc07 100644
--- a/apps/user/views.py
+++ b/apps/user/views.py
@@ -10,6 +10,7 @@ from django.conf import settings
from django.contrib.auth import login
from django.core.exceptions import ValidationError
from django.shortcuts import render, reverse, redirect
+from django.views import View
from django.views.generic import DetailView, UpdateView, TemplateView, FormView
from django.contrib import messages
from django.contrib.auth import get_user_model
@@ -25,8 +26,9 @@ from apps.course.models import Course
from apps.notification.utils import send_email
from apps.school.models import SchoolSchedule
from apps.payment.models import AuthorBalance, CoursePayment, SchoolPayment
+from apps.user.models import AuthorRequest, EmailSubscription, SubscriptionCategory
-from .forms import UserEditForm, WithdrawalForm
+from .forms import AuthorRequesForm, UserEditForm, WithdrawalForm
User = get_user_model()
@@ -85,6 +87,28 @@ class UserView(DetailView):
return context
+class SubscribeView(View):
+
+ def post(self, request, pk=None, **kwargs):
+ refferer = request.META.get('HTTP_REFERER')
+ if request.user.is_authenticated:
+ messages.info(request, 'Вы уже подписаны на рассылки.')
+ return redirect(refferer)
+ email = request.POST.get('email', None)
+ if email:
+ email_subscription = EmailSubscription.objects.create(
+ email=email,
+ )
+ email_subscription.categories.set(
+ SubscriptionCategory.objects.filter(auto_add=True)
+ )
+ messages.info(request, 'Вы подписаны на новости.')
+ return redirect(refferer)
+ else:
+ messages.error(request, 'Введите адрес электронной почты.')
+ return redirect(refferer)
+
+
@method_decorator(login_required, name='dispatch')
class NotificationEditView(TemplateView):
template_name = 'user/notification-settings.html'
@@ -92,6 +116,18 @@ class NotificationEditView(TemplateView):
def get(self, request, pk=None):
return super().get(request)
+ def post(self, request, pk=None):
+ categories = request.POST.getlist('category', [])
+ request.user.email_subscription.categories.set(
+ SubscriptionCategory.objects.filter(id__in=categories)
+ )
+ return redirect('user-edit-notifications', request.user.id)
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context['subscription_categories'] = SubscriptionCategory.objects.all()
+ return context
+
@method_decorator(login_required, name='dispatch')
class PaymentHistoryView(FormView):
@@ -115,7 +151,7 @@ class PaymentHistoryView(FormView):
type=AuthorBalance.OUT,
amount=form.cleaned_data['amount'],
status=AuthorBalance.PENDING,
- card=form.cleaned_data['amount'],
+ card=form.cleaned_data['card'],
)
return self.form_valid(form)
else:
@@ -182,3 +218,46 @@ class UserEditView(UpdateView):
def get_success_url(self):
return reverse('user-edit-profile', args=[self.object.id])
+
+
+class AuthorRequestView(FormView):
+ template_name = 'user/become-author.html'
+ form_class = AuthorRequesForm
+ success_url = reverse_lazy('author-request-success')
+
+ def post(self, request, pk=None):
+ form = self.get_form()
+ if form.is_valid():
+ if request.user.is_authenticated:
+ email = request.user.email
+ if request.user.role in [User.AUTHOR_ROLE, User.ADMIN_ROLE]:
+ messages.info(request, 'Вы уже являетесь автором')
+ return self.form_invalid(form)
+ else:
+ email = form.cleaned_data['email']
+
+ if AuthorRequest.objects.filter(email=email).exists():
+ messages.error(request, 'Вы уже отправили заявку на преподавателя')
+ return self.form_invalid(form)
+
+ AuthorRequest.objects.create(
+ first_name=form.cleaned_data['first_name'],
+ last_name=form.cleaned_data['last_name'],
+ email=email,
+ about=form.cleaned_data['about'],
+ facebook=form.cleaned_data['facebook'],
+ )
+ return self.form_valid(form)
+ else:
+ return self.form_invalid(form)
+
+ def get_context_data(self, **kwargs):
+ if self.request.user.is_authenticated:
+ self.initial = {
+ 'first_name': self.request.user.first_name,
+ 'last_name': self.request.user.last_name,
+ 'email': self.request.user.email,
+ 'about': self.request.user.about,
+ 'facebook': self.request.user.facebook,
+ }
+ return super().get_context_data(**kwargs)
diff --git a/docker-compose.yml b/docker-compose.yml
index ab168db4..d848728c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- "5432:5432"
redis:
- image: redis:3-alpine
+ image: redis:4-alpine
ports:
- "6379:6379"
@@ -22,7 +22,7 @@ services:
restart: always
volumes:
- .:/lilcity
- command: bash -c "python manage.py migrate && python manage.py loaddata /lilcity/apps/*/fixtures/*.json && gunicorn --workers=4 project.wsgi --bind=0.0.0.0:8000 --worker-class=gthread --reload"
+ command: bash -c "python manage.py collectstatic --no-input && python manage.py migrate && python manage.py loaddata /lilcity/apps/*/fixtures/*.json && gunicorn --workers=4 project.wsgi --bind=0.0.0.0:8000 --worker-class=gthread --reload"
environment:
- DJANGO_SETTINGS_MODULE=project.settings
- DATABASE_SERVICE_HOST=db
diff --git a/project/context_processors.py b/project/context_processors.py
new file mode 100644
index 00000000..cf8dc47a
--- /dev/null
+++ b/project/context_processors.py
@@ -0,0 +1,5 @@
+from apps.config.models import Config
+
+
+def config(request):
+ return {"config": Config.load()}
diff --git a/project/fields.py b/project/fields.py
new file mode 100644
index 00000000..a2e4709f
--- /dev/null
+++ b/project/fields.py
@@ -0,0 +1,14 @@
+from django.forms import ImageField as BaseImageField
+
+
+class ImageField(BaseImageField):
+
+ def to_internal_value(self, data):
+ # if data is None image field was not uploaded
+ if data:
+ file_object = super(ImageField, self).to_internal_value(data)
+ django_field = self._DjangoImageField()
+ django_field.error_messages = self.error_messages
+ django_field.to_python(file_object)
+ return file_object
+ return data
diff --git a/project/settings.py b/project/settings.py
index 6860b3d0..2934c1de 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -11,6 +11,8 @@ https://docs.djangoproject.com/en/2.0/ref/settings/
"""
import os
+import raven
+
from celery.schedules import crontab
from collections import OrderedDict
from datetime import timedelta
@@ -50,8 +52,8 @@ INSTALLED_APPS = [
'rest_framework.authtoken',
'drf_yasg',
'corsheaders',
- 'constance',
- 'constance.backends.database',
+ 'sorl.thumbnail',
+ 'raven.contrib.django.raven_compat',
] + [
'apps.auth.apps',
'apps.user',
@@ -59,10 +61,9 @@ INSTALLED_APPS = [
'apps.payment',
'apps.course',
'apps.content',
+ 'apps.config',
'apps.school',
]
-if DEBUG:
- INSTALLED_APPS += ['silk']
MIDDLEWARE = [
'corsheaders.middleware.CorsMiddleware',
@@ -73,9 +74,8 @@ MIDDLEWARE = [
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ 'apps.auth.middleware.TokenAuthLoginMiddleware',
]
-if DEBUG:
- MIDDLEWARE += ['silk.middleware.SilkyMiddleware']
ROOT_URLCONF = 'project.urls'
@@ -85,32 +85,26 @@ TEMPLATES = [
'DIRS': [
'project',
],
- 'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
- 'constance.context_processors.config',
+ 'project.context_processors.config',
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
+ 'loaders': [
+ ('django.template.loaders.cached.Loader', [
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+ ]),
+ ],
},
},
]
WSGI_APPLICATION = 'project.wsgi.application'
-
-# Database
-# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
-
-# DATABASES = {
-# 'default': {
-# 'ENGINE': 'django.db.backends.sqlite3',
-# 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-# }
-# }
-
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
@@ -202,6 +196,7 @@ REST_FRAMEWORK = {
),
'DEFAULT_RENDERER_CLASSES': (
'rest_framework.renderers.JSONRenderer',
+ # 'rest_framework.renderers.BrowsableAPIRenderer',
),
'DEFAULT_FILTER_BACKENDS': (
'django_filters.rest_framework.DjangoFilterBackend',
@@ -221,46 +216,11 @@ CELERY_TASK_SERIALIZER = 'json'
CELERY_BEAT_SCHEDULE = {
'retrieve_photos_from_instagram': {
'task': 'apps.content.tasks.retrieve_photos',
- 'schedule': timedelta(minutes=2) if DEBUG else crontab(minute=0, hour=0),
+ 'schedule': timedelta(minutes=5) if DEBUG else crontab(minute=0, hour=0),
'args': (),
},
}
-# Dynamic settings
-
-CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
-CONSTANCE_CONFIG = OrderedDict((
- ('INSTAGRAM_CLIENT_ACCESS_TOKEN', ('7145314808.f6fa114.ce354a5d876041fc9d3db04b0045587d', '')),
- ('INSTAGRAM_CLIENT_SECRET', ('2334a921425140ccb180d145dcd35b25', '')),
- ('INSTAGRAM_PROFILE_URL', ('#', 'URL профиля Instagram.')),
- ('INSTAGRAM_RESULTS_TAG', ('#lil_акварель', 'Тэг результатов работ.')),
- ('INSTAGRAM_RESULTS_PATH', ('media/instagram/results/', 'Путь до результатов работ.')),
- ('SERVICE_COMMISSION', (10, 'Комиссия сервиса в процентах.')),
- ('SERVICE_DISCOUNT_MIN_AMOUNT', (3500, 'Минимальная сумма платежа для школы, после которой вычитывается скидка SERVICE_DISCOUNT.')),
- ('SERVICE_DISCOUNT', (1000, 'Комиссия сервиса при покупке всех дней.')),
-))
-
-CONSTANCE_CONFIG_FIELDSETS = OrderedDict({
- 'Service': (
- 'SERVICE_COMMISSION',
- 'SERVICE_DISCOUNT_MIN_AMOUNT',
- 'SERVICE_DISCOUNT',
- ),
- 'Instagram': (
- 'INSTAGRAM_CLIENT_ACCESS_TOKEN',
- 'INSTAGRAM_CLIENT_SECRET',
- 'INSTAGRAM_PROFILE_URL',
- 'INSTAGRAM_RESULTS_TAG',
- 'INSTAGRAM_RESULTS_PATH',
- ),
-})
-
-
-try:
- from .local_settings import *
-except ImportError:
- pass
-
try:
from paymentwall import *
except ImportError:
@@ -270,6 +230,9 @@ else:
Paymentwall.set_app_key('d6f02b90cf6b16220932f4037578aff7')
Paymentwall.set_secret_key('4ea515bf94e34cf28646c2e12a7b8707')
+# Mixpanel settings
+MIX_TOKEN = '79bd6bfd98667ed977737e6810b8abcd'
+
# CORS settings
if DEBUG:
@@ -280,3 +243,18 @@ if DEBUG:
SWAGGER_SETTINGS = {
'DOC_EXPANSION': 'none',
}
+
+# Raven settings
+RAVEN_CONFIG = {
+ 'dsn': 'https://bff536c4d71c4166afb91f83b9f73d55:ca47ad791a53480b9d40a85a26abf141@sentry.io/306843',
+ # If you are using git, you can also automatically configure the
+ # release based on the git info.
+ 'release': raven.fetch_git_sha(BASE_DIR),
+}
+
+INSTAGRAM_RESULTS_PATH = 'media/instagram/results/'
+
+try:
+ from .local_settings import *
+except ImportError:
+ pass
diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html
index 0c2fc067..b5e79164 100644
--- a/project/templates/lilcity/edit_index.html
+++ b/project/templates/lilcity/edit_index.html
@@ -278,7 +278,7 @@
-
Выбор урока/дня
+
Выбор курса/дня
При записи на 5 уроков скидка 10%.
@@ -345,6 +345,10 @@
- {% else %}
- 
- {% endif %}
+ {% thumbnail course.cover.image "300x170" crop="center" as im %}
+ 
+ 
+ {% else %}
+ {% endif %}
@@ -24,4 +25,5 @@
{% endif %}