From 09bcbb399e6441eaedf196ca4a50793196f67941 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 11:49:32 +0300 Subject: [PATCH 01/73] Fix balance calc --- apps/user/models.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/user/models.py b/apps/user/models.py index 43eac1cd..e0b7afa8 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -1,3 +1,6 @@ +from json import dumps +from rest_framework.authtoken.models import Token + from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver @@ -5,10 +8,8 @@ from django.contrib.auth.models import AbstractUser, UserManager from django.contrib.postgres import fields as pgfields from django.utils.translation import gettext_lazy as _ -from rest_framework.authtoken.models import Token - -from json import dumps from api.v1 import serializers +from apps.payment.models import AuthorBalance class User(AbstractUser): @@ -63,7 +64,7 @@ class User(AbstractUser): @property def balance(self): - aggregate = self.balances.aggregate( + aggregate = self.balances.filter(type=AuthorBalance.IN).aggregate( models.Sum('amount'), models.Sum('commission'), ) From 6c60d411b4223026cf6188c053d375597d3240f5 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 12:08:53 +0300 Subject: [PATCH 02/73] Fix card field --- apps/user/models.py | 3 +-- apps/user/views.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/user/models.py b/apps/user/models.py index e0b7afa8..eb8bf8a3 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -9,7 +9,6 @@ from django.contrib.postgres import fields as pgfields from django.utils.translation import gettext_lazy as _ from api.v1 import serializers -from apps.payment.models import AuthorBalance class User(AbstractUser): @@ -64,7 +63,7 @@ class User(AbstractUser): @property def balance(self): - aggregate = self.balances.filter(type=AuthorBalance.IN).aggregate( + aggregate = self.balances.filter(type=0).aggregate( models.Sum('amount'), models.Sum('commission'), ) diff --git a/apps/user/views.py b/apps/user/views.py index 69e42bef..44d9a486 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -115,7 +115,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: From b8e393f82f1e7826b25f7557b500f9e7ca13c732 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 12:39:05 +0300 Subject: [PATCH 03/73] LIL-284. Add api for moderation of comments --- api/v1/serializers/course.py | 46 ++++++++++++++++++++++++++++++++++-- api/v1/urls.py | 4 +++- api/v1/views.py | 14 ++++++++++- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index 8139d8fa..52e16a25 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -1,7 +1,11 @@ from rest_framework import serializers -from apps.course.models import Category, Course, Material, Lesson, Like - +from apps.course.models import ( + Category, Course, + Comment, CourseComment, LessonComment, + Material, Lesson, + Like, +) from .content import ( ImageObjectSerializer, ContentSerializer, ContentCreateSerializer, GallerySerializer, GalleryImageSerializer, @@ -368,3 +372,41 @@ class CourseSerializer(serializers.ModelSerializer): 'update_at', 'deactivated_at', ) + + +class CommentSerializer(serializers.ModelSerializer): + + class Meta: + model = Comment + fields = ( + 'id', + 'content', + 'author', + 'parent', + 'created_at', + 'update_at', + ) + + def to_representation(self, instance): + if isinstance(instance, CourseComment): + return CourseCommentSerializer(instance, context=self.context).to_representation(instance) + elif isinstance(instance, LessonComment): + return LessonCommentSerializer(instance, context=self.context).to_representation(instance) + + +class CourseCommentSerializer(serializers.ModelSerializer): + + class Meta: + model = CourseComment + fields = CommentSerializer.Meta.fields + ( + 'course', + ) + + +class LessonCommentSerializer(serializers.ModelSerializer): + + class Meta: + model = LessonComment + fields = CommentSerializer.Meta.fields + ( + 'lesson', + ) diff --git a/api/v1/urls.py b/api/v1/urls.py index ab852c4d..3f487bd9 100644 --- a/api/v1/urls.py +++ b/api/v1/urls.py @@ -10,6 +10,7 @@ from .auth import ObtainToken from .views import ( AuthorBalanceViewSet, ConfigViewSet, CategoryViewSet, CourseViewSet, + CommentViewSet, MaterialViewSet, LikeViewSet, ImageViewSet, TextViewSet, ImageTextViewSet, VideoViewSet, @@ -20,8 +21,9 @@ from .views import ( router = DefaultRouter() router.register(r'author-balance', AuthorBalanceViewSet, base_name='author-balance') -router.register(r'courses', CourseViewSet, base_name='courses') router.register(r'categories', CategoryViewSet, base_name='categories') +router.register(r'courses', CourseViewSet, base_name='courses') +router.register(r'comments', CommentViewSet, base_name='comments') router.register(r'materials', MaterialViewSet, base_name='materials') router.register(r'lessons', LessonViewSet, base_name='lessons') router.register(r'likes', LikeViewSet, base_name='likes') diff --git a/api/v1/views.py b/api/v1/views.py index 68f0f428..6ae66284 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -15,6 +15,7 @@ from .serializers.course import ( CategorySerializer, LikeSerializer, CourseSerializer, CourseCreateSerializer, CourseBulkChangeCategorySerializer, + CommentSerializer, MaterialSerializer, MaterialCreateSerializer, LessonSerializer, LessonCreateSerializer, ) @@ -35,7 +36,12 @@ from .serializers.user import ( from .permissions import IsAdmin, IsAdminOrIsSelf, IsAuthorOrAdmin, IsAuthorObjectOrAdmin -from apps.course.models import Category, Course, Material, Lesson, Like +from apps.course.models import ( + Category, Course, + Comment, CourseComment, LessonComment, + Material, Lesson, + Like, +) from apps.content.models import ( Image, Text, ImageText, Video, Gallery, GalleryImage, ImageObject, @@ -329,3 +335,9 @@ class ConfigViewSet(generics.RetrieveUpdateAPIView): if serializer.is_valid(): serializer.update(get_values(), serializer.validated_data) return Response(serializer.data) + + +class CommentViewSet(ExtendedModelViewSet): + queryset = Comment.objects.all() + serializer_class = CommentSerializer + permission_classes = (IsAdmin,) From 5b95f099497d1269c255a4dc66505d2b64bcf4d8 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 13:06:43 +0300 Subject: [PATCH 04/73] LIL-33. Add DeactivatedMixin to Comment model --- .../migrations/0035_comment_deactivated_at.py | 18 ++++++++++++++++++ apps/course/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 apps/course/migrations/0035_comment_deactivated_at.py diff --git a/apps/course/migrations/0035_comment_deactivated_at.py b/apps/course/migrations/0035_comment_deactivated_at.py new file mode 100644 index 00000000..cd5ba08e --- /dev/null +++ b/apps/course/migrations/0035_comment_deactivated_at.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.2 on 2018-03-12 10:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('course', '0034_auto_20180215_1503'), + ] + + operations = [ + migrations.AddField( + model_name='comment', + name='deactivated_at', + field=models.DateTimeField(blank=True, default=None, null=True), + ), + ] diff --git a/apps/course/models.py b/apps/course/models.py index ad59b1b1..98a64423 100644 --- a/apps/course/models.py +++ b/apps/course/models.py @@ -196,7 +196,7 @@ class Material(models.Model): ordering = ('title',) -class Comment(PolymorphicMPTTModel): +class Comment(PolymorphicMPTTModel, DeactivatedMixin): content = models.TextField('Текст комментария', default='') author = models.ForeignKey(User, on_delete=models.CASCADE) parent = PolymorphicTreeForeignKey( From ff8708ea0073743bba6e029ad82636fde17f943a Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 13:11:15 +0300 Subject: [PATCH 05/73] LIL-33. Add deactivated_at field to CommentSerializer --- api/v1/serializers/course.py | 1 + 1 file changed, 1 insertion(+) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index 52e16a25..a9679fee 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -383,6 +383,7 @@ class CommentSerializer(serializers.ModelSerializer): 'content', 'author', 'parent', + 'deactivated_at', 'created_at', 'update_at', ) From 7b7ee5230caa4e76a2dd8687d8bd26e8452c099f Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 13:11:41 +0300 Subject: [PATCH 06/73] LIL-33. Don't show deactivated comments. --- apps/course/templates/course/blocks/comment.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/course/templates/course/blocks/comment.html b/apps/course/templates/course/blocks/comment.html index 1f338358..463536af 100644 --- a/apps/course/templates/course/blocks/comment.html +++ b/apps/course/templates/course/blocks/comment.html @@ -1,5 +1,5 @@ {% load static %} - +{% if not node.deactivated_at %}
{% if node.author.photo %}
@@ -24,4 +24,5 @@ {% endif %}
- \ No newline at end of file + +{% endif %} From d10369147e4e269088c6cfca849fb29edd19fd17 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 12 Mar 2018 17:12:50 +0700 Subject: [PATCH 07/73] fixes, gallery --- apps/course/templates/course/content/gallery.html | 12 ++++++++---- apps/course/templates/course/content/image.html | 8 +++++--- apps/course/templates/course/content/imagetext.html | 6 ++++-- web/package.json | 1 + web/src/components/CourseRedactor.vue | 2 +- web/src/js/modules/common.js | 6 ++++++ web/src/sass/_common.sass | 2 +- web/src/sass/app.sass | 1 + 8 files changed, 27 insertions(+), 11 deletions(-) diff --git a/apps/course/templates/course/content/gallery.html b/apps/course/templates/course/content/gallery.html index 771df8b6..32a4bf91 100644 --- a/apps/course/templates/course/content/gallery.html +++ b/apps/course/templates/course/content/gallery.html @@ -1,18 +1,22 @@ {% if results %}
Галерея итогов обучения
-
+
{% for image in course.gallery.gallery_images.all %}
- + + +
{% endfor %}
{% else %}
{{ content.title }}
-
+
{% for image in content.gallery_images.all %}
- + + +
{% endfor %}
diff --git a/apps/course/templates/course/content/image.html b/apps/course/templates/course/content/image.html index 5daeba4e..1117d434 100644 --- a/apps/course/templates/course/content/image.html +++ b/apps/course/templates/course/content/image.html @@ -1,6 +1,8 @@
{{ content.title }}
-
- -
\ No newline at end of file +
+ + + +
diff --git a/apps/course/templates/course/content/imagetext.html b/apps/course/templates/course/content/imagetext.html index 9849e357..0b3301cc 100644 --- a/apps/course/templates/course/content/imagetext.html +++ b/apps/course/templates/course/content/imagetext.html @@ -4,6 +4,8 @@
{{ content.txt | safe }}
-
- +
+ + +
\ No newline at end of file diff --git a/web/package.json b/web/package.json index 96794b84..ba9de0b4 100755 --- a/web/package.json +++ b/web/package.json @@ -55,6 +55,7 @@ "dependencies": { "axios": "^0.17.1", "babel-polyfill": "^6.26.0", + "baguettebox.js": "^1.10.0", "history": "^4.7.2", "ilyabirman-likely": "^2.3.0", "inputmask": "^3.3.11", diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index 0f94eb3e..d173f8cf 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -551,7 +551,7 @@ clearTimeout(this.savingTimeout); document.getElementById('course-redactor__saving-status').innerText = 'СОХРАНЕНИЕ'; const courseObject = this.course; - courseObject.url = slugify(courseObject.url); + courseObject.url = (courseObject.url) ? slugify(courseObject.url):courseObject.url; api.saveCourse(courseObject, this.accessToken) .then((response) => { this.courseSaving = false; diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js index ecbd4dee..dea36989 100644 --- a/web/src/js/modules/common.js +++ b/web/src/js/modules/common.js @@ -1,8 +1,14 @@ import $ from 'jquery'; import Inputmask from "inputmask"; import SmoothScroll from 'smooth-scroll/dist/js/smooth-scroll'; +import baguetteBox from 'baguettebox.js' + window.Inputmask = Inputmask; +window.baguetteBox = baguetteBox; + $(document).ready(function () { + + baguetteBox.run('.gallery'); // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. $.ajaxSetup({ headers: { diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index de962138..4d66e5d8 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -1857,7 +1857,7 @@ a.grey-link left: -10px right: -10px height: 2px - margin-top: -2px + margin-top: 5px background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) &__title display: table diff --git a/web/src/sass/app.sass b/web/src/sass/app.sass index 9272f307..020d748e 100755 --- a/web/src/sass/app.sass +++ b/web/src/sass/app.sass @@ -2,3 +2,4 @@ @import helpers/all @import generated/sprite-svg @import common +@import '../../node_modules/baguettebox.js/src/baguetteBox.scss' From 9e26bc15c5f06e933f618389bea6e3a22ab2a558 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 13:31:39 +0300 Subject: [PATCH 08/73] LIL-284. Comment author as object --- api/v1/serializers/course.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index a9679fee..67516670 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -375,6 +375,7 @@ class CourseSerializer(serializers.ModelSerializer): class CommentSerializer(serializers.ModelSerializer): + author = UserSerializer() class Meta: model = Comment @@ -396,6 +397,7 @@ class CommentSerializer(serializers.ModelSerializer): class CourseCommentSerializer(serializers.ModelSerializer): + author = UserSerializer() class Meta: model = CourseComment @@ -405,6 +407,7 @@ class CourseCommentSerializer(serializers.ModelSerializer): class LessonCommentSerializer(serializers.ModelSerializer): + author = UserSerializer() class Meta: model = LessonComment From f3638fafb0c7f44a64c9e201d7e985a1ad5027a3 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 17:02:05 +0300 Subject: [PATCH 09/73] LIL-290. Add AuthorRequest model --- apps/user/migrations/0009_authorrequest.py | 27 ++++++++++++++++ apps/user/models.py | 37 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 apps/user/migrations/0009_authorrequest.py diff --git a/apps/user/migrations/0009_authorrequest.py b/apps/user/migrations/0009_authorrequest.py new file mode 100644 index 00000000..9e10d01c --- /dev/null +++ b/apps/user/migrations/0009_authorrequest.py @@ -0,0 +1,27 @@ +# Generated by Django 2.0.2 on 2018-03-12 14:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0008_auto_20180212_0750'), + ] + + operations = [ + migrations.CreateModel( + name='AuthorRequest', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=30, verbose_name='first name')), + ('last_name', models.CharField(max_length=150, verbose_name='last name')), + ('email', models.EmailField(max_length=254, verbose_name='email address')), + ('about', models.CharField(blank=True, max_length=1000, null=True, verbose_name='О себе')), + ('facebook', models.URLField(blank=True, default='', null=True)), + ('status', models.PositiveSmallIntegerField(choices=[(0, 'pending'), (1, 'accepted'), (2, 'declined')], default=0)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('update_at', models.DateTimeField(auto_now=True)), + ], + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index eb8bf8a3..a543d782 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -85,3 +85,40 @@ def create_auth_token(sender, instance=None, created=False, **kwargs): instance.role not in [User.AUTHOR_ROLE, User.ADMIN_ROLE] ) and hasattr(instance, 'auth_token'): instance.auth_token.delete() + + +class AuthorRequestManager(models.Manager): + def create_by_user(self, user): + obj = self.model( + first_name=user.first_name, + last_name=user.last_name, + email=user.email, + about=user.about, + facebook=user.facebook, + ) + self._for_write = True + obj.save(force_insert=True, using=self.db) + return obj + + +class AuthorRequest(models.Model): + PENDING = 0 + ACCEPTED = 1 + DECLINED = 2 + STATUS_CHOICES = ( + (PENDING, 'pending'), + (ACCEPTED, 'accepted'), + (DECLINED, 'declined'), + ) + + first_name = models.CharField(_('first name'), max_length=30) + last_name = models.CharField(_('last name'), max_length=150) + email = models.EmailField(_('email address')) + about = models.CharField('О себе', max_length=1000, null=True, blank=True) + facebook = models.URLField(default='', null=True, blank=True) + status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, default=PENDING) + + created_at = models.DateTimeField(auto_now_add=True) + update_at = models.DateTimeField(auto_now=True) + + objects = AuthorRequestManager() From 77ca5e3737ae82766e331d7ee038aca59c8f2766 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 17:06:05 +0300 Subject: [PATCH 10/73] LIL-291. Add author reques template & form --- apps/user/forms.py | 8 +++ apps/user/templates/user/become-author.html | 61 +++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 apps/user/templates/user/become-author.html diff --git a/apps/user/forms.py b/apps/user/forms.py index 2f75ef68..f2933c70 100644 --- a/apps/user/forms.py +++ b/apps/user/forms.py @@ -54,3 +54,11 @@ class UserEditForm(forms.ModelForm): class WithdrawalForm(forms.Form): amount = forms.DecimalField(required=True, min_value=2000) card = CreditCardField(required=True) + + +class AuthorRequesForm(forms.Form): + first_name = forms.CharField() + last_name = forms.CharField() + email = forms.CharField() + about = forms.CharField() + facebook = forms.URLField(required=False) diff --git a/apps/user/templates/user/become-author.html b/apps/user/templates/user/become-author.html new file mode 100644 index 00000000..bc08345c --- /dev/null +++ b/apps/user/templates/user/become-author.html @@ -0,0 +1,61 @@ +{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %} +
+
+
{% csrf_token %} +
+
Стать автором
+
+
+
ИМЯ
+
+ +
+ {% if form.first_name.errors %} +
Укажите корректно свои данные
+ {% endif %} +
+
+
ФАМИЛИЯ
+
+ +
+ {% if form.last_name.errors %} +
Укажите корректно свои данные
+ {% endif %} +
+
+
+
Почта
+
+ +
+ {% if form.email.errors %} +
Укажите корректно свои данные
+ {% endif %} +
+
+
О себе
+
+ +
+ {% if form.about.errors %} +
Укажите корректно свои данные
+ {% endif %} +
+
+
FACEBOOK
+
+ +
+ {% if form.facebook.errors %} +
Укажите корректно свои данные
+ {% endif %} +
+
+
+ +
+
+
+
+{% endblock content %} From a93aa10474ecad54c41ab5dc0575d521f67d5a1a Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 18:56:02 +0300 Subject: [PATCH 11/73] LIL-300. Add success page for author request --- apps/user/templates/user/become-author-success.html | 12 ++++++++++++ project/urls.py | 1 + 2 files changed, 13 insertions(+) create mode 100644 apps/user/templates/user/become-author-success.html diff --git a/apps/user/templates/user/become-author-success.html b/apps/user/templates/user/become-author-success.html new file mode 100644 index 00000000..e6e97f7d --- /dev/null +++ b/apps/user/templates/user/become-author-success.html @@ -0,0 +1,12 @@ +{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %} +
+
+
+
Ваша заявка отправлена!
+
+ ПЕРЕЙТИ К ГЛАВНОЙ +
+
+
+
+{% endblock content %} diff --git a/project/urls.py b/project/urls.py index 30a14cbd..52755963 100644 --- a/project/urls.py +++ b/project/urls.py @@ -35,6 +35,7 @@ from .views import IndexView urlpatterns = [ path('admin/', admin.site.urls), path('auth/', include(('apps.auth.urls', 'lilcity'))), + path('author-request/success/', TemplateView.as_view(template_name='user/become-author-success.html'), name='author-request-success'), path('courses/', CoursesView.as_view(), name='courses'), path('course/create', CourseEditView.as_view(), name='course_create'), path('course/on-moderation', CourseOnModerationView.as_view(), name='course-on-moderation'), From e68b383d57541a9e2bae458c415dae0a00b8a9e8 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 19:11:25 +0300 Subject: [PATCH 12/73] LIL-290. Add unique to AuthorRequest email field --- .../user/migrations/0010_auto_20180312_1610.py | 18 ++++++++++++++++++ apps/user/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 apps/user/migrations/0010_auto_20180312_1610.py diff --git a/apps/user/migrations/0010_auto_20180312_1610.py b/apps/user/migrations/0010_auto_20180312_1610.py new file mode 100644 index 00000000..b691deea --- /dev/null +++ b/apps/user/migrations/0010_auto_20180312_1610.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.2 on 2018-03-12 16:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0009_authorrequest'), + ] + + operations = [ + migrations.AlterField( + model_name='authorrequest', + name='email', + field=models.EmailField(max_length=254, unique=True, verbose_name='email address'), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index a543d782..9ce0e760 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -113,7 +113,7 @@ class AuthorRequest(models.Model): first_name = models.CharField(_('first name'), max_length=30) last_name = models.CharField(_('last name'), max_length=150) - email = models.EmailField(_('email address')) + email = models.EmailField(_('email address'), unique=True) about = models.CharField('О себе', max_length=1000, null=True, blank=True) facebook = models.URLField(default='', null=True, blank=True) status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, default=PENDING) From d5f65f5b957245c648c86631bfd7eaca39847396 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 19:12:47 +0300 Subject: [PATCH 13/73] LIL-299. Add AuthorRequest view --- .../user/templates/user/profile-settings.html | 4 +- apps/user/views.py | 46 ++++++++++++++++++- project/templates/lilcity/index.html | 7 ++- project/urls.py | 12 +++-- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html index 68d41375..33baee8e 100644 --- a/apps/user/templates/user/profile-settings.html +++ b/apps/user/templates/user/profile-settings.html @@ -79,7 +79,7 @@ {% if form.email.errors %}
Укажите корректно свои данные
{% endif %} -
+
ГОРОД
@@ -250,4 +250,4 @@ var openFile = function(file) { reader.readAsDataURL(input.files[0]); }; -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/apps/user/views.py b/apps/user/views.py index 44d9a486..53e1d689 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -26,7 +26,8 @@ from apps.notification.utils import send_email from apps.school.models import SchoolSchedule from apps.payment.models import AuthorBalance, CoursePayment, SchoolPayment -from .forms import UserEditForm, WithdrawalForm +from .forms import AuthorRequesForm, UserEditForm, WithdrawalForm +from .models import AuthorRequest User = get_user_model() @@ -182,3 +183,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('Вы уже являетесь автором') + return self.form_invalid(form) + else: + email = form.cleaned_data['email'] + + if AuthorRequest.objects.filter(email=email).exists(): + messages.error('Вы уже отправили заявку на преподавателя') + return self.form_invalid(form) + + AuthorRequest.objects.create( + first_name=form.cleaned_daLILta['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): + 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() diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index 2f28628d..b6bb1808 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -188,8 +188,11 @@
Программы
- +
Контакты
diff --git a/project/urls.py b/project/urls.py index 52755963..bdb2290d 100644 --- a/project/urls.py +++ b/project/urls.py @@ -25,7 +25,8 @@ from apps.course.views import ( CourseOnModerationView, ) from apps.user.views import ( - UserView, UserEditView, NotificationEditView, + AuthorRequestView, UserView, + UserEditView, NotificationEditView, PaymentHistoryView, resend_email_verify, ) from apps.payment.views import CourseBuyView, PaymentwallCallbackView, SchoolBuyView @@ -35,6 +36,7 @@ from .views import IndexView urlpatterns = [ path('admin/', admin.site.urls), path('auth/', include(('apps.auth.urls', 'lilcity'))), + path('author-request/', AuthorRequestView.as_view(), name='author_request'), path('author-request/success/', TemplateView.as_view(template_name='user/become-author-success.html'), name='author-request-success'), path('courses/', CoursesView.as_view(), name='courses'), path('course/create', CourseEditView.as_view(), name='course_create'), @@ -59,12 +61,12 @@ urlpatterns = [ path('user//notifications', NotificationEditView.as_view(), name='user-edit-notifications'), path('user//payments', PaymentHistoryView.as_view(), name='user-edit-payments'), path('user/resend-email-verify', resend_email_verify, name='resend-email-verify'), - path('privacy', TemplateView.as_view(template_name="templates/lilcity/privacy_policy.html"), name='privacy'), - path('terms', TemplateView.as_view(template_name="templates/lilcity/terms.html"), name='terms'), - path('refund-policy', TemplateView.as_view(template_name="templates/lilcity/refund_policy.html"), name='refund_policy'), + path('privacy', TemplateView.as_view(template_name='templates/lilcity/privacy_policy.html'), name='privacy'), + path('terms', TemplateView.as_view(template_name='templates/lilcity/terms.html'), name='terms'), + path('refund-policy', TemplateView.as_view(template_name='templates/lilcity/refund_policy.html'), name='refund_policy'), path('', IndexView.as_view(), name='index'), path('api/v1/', include(('api.v1.urls', 'api_v1'))), - path('test', TemplateView.as_view(template_name="templates/lilcity/test.html"), name='test'), + path('test', TemplateView.as_view(template_name='templates/lilcity/test.html'), name='test'), ] From febdb7d98e559d251cbc1ab02386614200ae5781 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 08:38:18 +0300 Subject: [PATCH 14/73] Update req and images --- Dockerfile | 6 +----- docker-compose.yml | 2 +- requirements.txt | 12 ++++++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index c61bc829..18f28383 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,8 @@ FROM python:3.6 ENV PYTHONUNBUFFERED 1 RUN mkdir /lilcity WORKDIR /lilcity -RUN apt-get update \ - && apt-get install -y postgresql-client-9.4 \ - && rm -rf /var/lib/apt/lists/* \ - && pip install --upgrade pip ADD requirements.txt /lilcity/ RUN pip install -r requirements.txt -ADD . /lilcity/ \ No newline at end of file +ADD . /lilcity/ diff --git a/docker-compose.yml b/docker-compose.yml index ab168db4..b3c84e2f 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" diff --git a/requirements.txt b/requirements.txt index 2b469cf2..72581abb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ # Python-3.6 gunicorn==19.7.1 requests==2.18.4 -Django==2.0.2 -django-anymail[mailgun]==1.2 +Django==2.0.3 +django-anymail[mailgun]==2.0 # paymentwall-python==1.0.7 git+https://github.com/ivlevdenis/paymentwall-python.git -twilio==6.10.0 -psycopg2==2.7.3.2 +twilio==6.10.5 +psycopg2-binary==2.7.4 facepy==1.0.9 Pillow==5.0.0 django-active-link==0.1.2 @@ -16,9 +16,9 @@ django-mptt==0.9.0 django-polymorphic-tree==1.5 celery[redis]==4.1.0 djangorestframework==3.7.7 -drf-yasg[validation]==1.4.0 +drf-yasg[validation]==1.5.0 django-silk==2.0.0 -django-cors-headers==2.1.0 +django-cors-headers==2.2.0 django-constance[database]==2.1.0 # python-instagram==1.3.2 git+https://github.com/ivlevdenis/python-instagram.git From c88907dc08de8f90205c904206492c5282458682 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 09:09:08 +0300 Subject: [PATCH 15/73] Add mixpanel to req --- requirements.txt | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 72581abb..4faab0da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,25 @@ # Python-3.6 -gunicorn==19.7.1 -requests==2.18.4 +arrow==0.12.1 +celery[redis]==4.1.0 Django==2.0.3 -django-anymail[mailgun]==2.0 -# paymentwall-python==1.0.7 -git+https://github.com/ivlevdenis/paymentwall-python.git -twilio==6.10.5 -psycopg2-binary==2.7.4 -facepy==1.0.9 -Pillow==5.0.0 django-active-link==0.1.2 -arrow==0.12.1 +django-anymail[mailgun]==2.0 +django-cors-headers==2.2.0 +django-constance[database]==2.1.0 django-filter==2.0.0.dev1 django-mptt==0.9.0 +django-silk==2.0.0 django-polymorphic-tree==1.5 -celery[redis]==4.1.0 djangorestframework==3.7.7 drf-yasg[validation]==1.5.0 -django-silk==2.0.0 -django-cors-headers==2.2.0 -django-constance[database]==2.1.0 +facepy==1.0.9 +gunicorn==19.7.1 +mixpanel==4.3.2 +requests==2.18.4 +psycopg2-binary==2.7.4 +Pillow==5.0.0 +twilio==6.10.5 +# paymentwall-python==1.0.7 +git+https://github.com/ivlevdenis/paymentwall-python.git # python-instagram==1.3.2 git+https://github.com/ivlevdenis/python-instagram.git From 314c7fc9591d0ca9a26c09f7006aef3f76bbe64c Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 10:44:02 +0300 Subject: [PATCH 16/73] LIL-291. Add messages to author request form --- apps/user/templates/user/become-author.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/user/templates/user/become-author.html b/apps/user/templates/user/become-author.html index bc08345c..383b81ab 100644 --- a/apps/user/templates/user/become-author.html +++ b/apps/user/templates/user/become-author.html @@ -1,4 +1,12 @@ -{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %} +{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %} {% if messages %} +
+
+ {% for message in messages %} +
{{ message }}
+ {% endfor %} +
+
+{% endif %}
{% csrf_token %} From aa9179e9caf3c28811f88c46883fb67e2bf0d450 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 10:45:02 +0300 Subject: [PATCH 17/73] LIL-290. Add ordering to AuthorRequest model --- apps/user/migrations/0011_auto_20180313_0744.py | 17 +++++++++++++++++ apps/user/models.py | 5 +++++ 2 files changed, 22 insertions(+) create mode 100644 apps/user/migrations/0011_auto_20180313_0744.py diff --git a/apps/user/migrations/0011_auto_20180313_0744.py b/apps/user/migrations/0011_auto_20180313_0744.py new file mode 100644 index 00000000..3fe91ef7 --- /dev/null +++ b/apps/user/migrations/0011_auto_20180313_0744.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.3 on 2018-03-13 07:44 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0010_auto_20180312_1610'), + ] + + operations = [ + migrations.AlterModelOptions( + name='authorrequest', + options={'ordering': ('-created_at',), 'verbose_name': 'Заявка не преподавателя', 'verbose_name_plural': 'Заявки не преподавателя'}, + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index 9ce0e760..ae807779 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -122,3 +122,8 @@ class AuthorRequest(models.Model): update_at = models.DateTimeField(auto_now=True) objects = AuthorRequestManager() + + class Meta: + verbose_name = 'Заявка не преподавателя' + verbose_name_plural = 'Заявки не преподавателя' + ordering = ('-created_at',) From 669d5afc990e6f136f5b30710c47d31770e9ffe9 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 10:45:31 +0300 Subject: [PATCH 18/73] LIL-299. Fix create AuthorRequest --- apps/user/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/user/views.py b/apps/user/views.py index 53e1d689..9f647065 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -196,17 +196,17 @@ class AuthorRequestView(FormView): if request.user.is_authenticated: email = request.user.email if request.user.role in [User.AUTHOR_ROLE, User.ADMIN_ROLE]: - messages.info('Вы уже являетесь автором') + messages.info(request, 'Вы уже являетесь автором') return self.form_invalid(form) else: email = form.cleaned_data['email'] if AuthorRequest.objects.filter(email=email).exists(): - messages.error('Вы уже отправили заявку на преподавателя') + messages.error(request, 'Вы уже отправили заявку на преподавателя') return self.form_invalid(form) AuthorRequest.objects.create( - first_name=form.cleaned_daLILta['first_name'], + first_name=form.cleaned_data['first_name'], last_name=form.cleaned_data['last_name'], email=email, about=form.cleaned_data['about'], @@ -216,7 +216,7 @@ class AuthorRequestView(FormView): else: return self.form_invalid(form) - def get_context_data(self): + def get_context_data(self, **kwargs): if self.request.user.is_authenticated: self.initial = { 'first_name': self.request.user.first_name, @@ -225,4 +225,4 @@ class AuthorRequestView(FormView): 'about': self.request.user.about, 'facebook': self.request.user.facebook, } - return super().get_context_data() + return super().get_context_data(**kwargs) From a43973ba98a369a2b4f81ac97f85fb2cbb41ba00 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 10:46:39 +0300 Subject: [PATCH 19/73] LIL-293. Add api for managing AuthorRequest --- api/v1/serializers/user.py | 24 +++++++++++++++++++++++- api/v1/urls.py | 7 ++++--- api/v1/views.py | 8 ++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/api/v1/serializers/user.py b/api/v1/serializers/user.py index 8ce068e2..896af2dd 100644 --- a/api/v1/serializers/user.py +++ b/api/v1/serializers/user.py @@ -2,7 +2,7 @@ from django.contrib.auth import get_user_model from rest_framework import serializers from . import Base64ImageField - +from apps.user.models import AuthorRequest User = get_user_model() @@ -53,3 +53,25 @@ class UserPhotoSerializer(serializers.Serializer): photo = Base64ImageField( required=False, allow_empty_file=True, allow_null=True ) + + +class AuthorRequestSerializer(serializers.ModelSerializer): + class Meta: + model = AuthorRequest + fields = ( + 'id', + 'first_name', + 'last_name', + 'email', + 'about', + 'facebook', + 'status', + 'created_at', + 'update_at', + ) + + read_only_fields = ( + 'id', + 'created_at', + 'update_at', + ) diff --git a/api/v1/urls.py b/api/v1/urls.py index 3f487bd9..cf52179a 100644 --- a/api/v1/urls.py +++ b/api/v1/urls.py @@ -8,9 +8,9 @@ from drf_yasg import openapi from .auth import ObtainToken from .views import ( - AuthorBalanceViewSet, ConfigViewSet, - CategoryViewSet, CourseViewSet, - CommentViewSet, + AuthorBalanceViewSet, AuthorRequestViewSet, + ConfigViewSet, CategoryViewSet, + CourseViewSet, CommentViewSet, MaterialViewSet, LikeViewSet, ImageViewSet, TextViewSet, ImageTextViewSet, VideoViewSet, @@ -20,6 +20,7 @@ from .views import ( ) router = DefaultRouter() +router.register(r'author-requests', AuthorRequestViewSet, base_name='author-requests') router.register(r'author-balance', AuthorBalanceViewSet, base_name='author-balance') router.register(r'categories', CategoryViewSet, base_name='categories') router.register(r'courses', CourseViewSet, base_name='courses') diff --git a/api/v1/views.py b/api/v1/views.py index 6ae66284..8d553dd8 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -31,6 +31,7 @@ from .serializers.content import ( from .serializers.school import SchoolScheduleSerializer from .serializers.payment import AuthorBalanceSerializer, AuthorBalanceCreateSerializer from .serializers.user import ( + AuthorRequestSerializer, UserSerializer, UserPhotoSerializer, ) @@ -48,6 +49,7 @@ from apps.content.models import ( ) from apps.payment.models import AuthorBalance from apps.school.models import SchoolSchedule +from apps.user.models import AuthorRequest User = get_user_model() @@ -341,3 +343,9 @@ class CommentViewSet(ExtendedModelViewSet): queryset = Comment.objects.all() serializer_class = CommentSerializer permission_classes = (IsAdmin,) + + +class AuthorRequestViewSet(ExtendedModelViewSet): + queryset = AuthorRequest.objects.all() + serializer_class = AuthorRequestSerializer + permission_classes = (IsAdmin,) From ae301bd0e10fcfc25b90f6674639b897bcc376e8 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 10:50:36 +0300 Subject: [PATCH 20/73] LIL-290. Add cause field for AuthorRequest --- .../migrations/0012_authorrequest_cause.py | 18 ++++++++++++++++++ apps/user/models.py | 1 + 2 files changed, 19 insertions(+) create mode 100644 apps/user/migrations/0012_authorrequest_cause.py diff --git a/apps/user/migrations/0012_authorrequest_cause.py b/apps/user/migrations/0012_authorrequest_cause.py new file mode 100644 index 00000000..fef855a2 --- /dev/null +++ b/apps/user/migrations/0012_authorrequest_cause.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-03-13 07:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0011_auto_20180313_0744'), + ] + + operations = [ + migrations.AddField( + model_name='authorrequest', + name='cause', + field=models.TextField(blank=True, null=True, verbose_name='Причина отказа'), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index ae807779..6e2e6fef 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -117,6 +117,7 @@ class AuthorRequest(models.Model): about = models.CharField('О себе', max_length=1000, null=True, blank=True) facebook = models.URLField(default='', null=True, blank=True) status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, default=PENDING) + cause = models.TextField('Причина отказа', null=True, blank=True) created_at = models.DateTimeField(auto_now_add=True) update_at = models.DateTimeField(auto_now=True) From a23f9fcdb17336dd40d074ebe55caddd61be58bc Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 11:18:48 +0300 Subject: [PATCH 21/73] LIL-303. Only root nodes of comments in top --- api/v1/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1/views.py b/api/v1/views.py index 8d553dd8..db0d8754 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -340,7 +340,7 @@ class ConfigViewSet(generics.RetrieveUpdateAPIView): class CommentViewSet(ExtendedModelViewSet): - queryset = Comment.objects.all() + queryset = Comment.objects.filter(level=0) serializer_class = CommentSerializer permission_classes = (IsAdmin,) From 479d4a72d78b441cbc668988733c2e12538610c9 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 11:19:14 +0300 Subject: [PATCH 22/73] LIL-303. Tree comments --- api/v1/serializers/course.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index 67516670..197d4a0e 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -398,19 +398,23 @@ class CommentSerializer(serializers.ModelSerializer): class CourseCommentSerializer(serializers.ModelSerializer): author = UserSerializer() + children = CommentSerializer(many=True) class Meta: model = CourseComment fields = CommentSerializer.Meta.fields + ( 'course', + 'children', ) class LessonCommentSerializer(serializers.ModelSerializer): author = UserSerializer() + children = CommentSerializer(many=True) class Meta: model = LessonComment fields = CommentSerializer.Meta.fields + ( 'lesson', + 'children', ) From b604b5bb038e4e6f759259d2d28a4720b1fbbac4 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 12:21:42 +0300 Subject: [PATCH 23/73] LIL-33. Hide deactivated comments with childs --- apps/course/templates/course/blocks/comments.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/course/templates/course/blocks/comments.html b/apps/course/templates/course/blocks/comments.html index c762ebc5..b2b74983 100644 --- a/apps/course/templates/course/blocks/comments.html +++ b/apps/course/templates/course/blocks/comments.html @@ -1,5 +1,10 @@ {% load mptt_tags %} {% recursetree object.comments.all %} +{% if not node.deactivated_at %} {% include './comment.html' %} -{{ children }} {% endrecursetree %} \ No newline at end of file +{% if not node.is_leaf_node %} +{{ children }} +{% endif %} +{% endif %} +{% endrecursetree %} From f8b28c9ca7dc193beaff1a5223276cf4142d0f81 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 12:55:52 +0300 Subject: [PATCH 24/73] LIL-33. Add read only fields for CommentSerializer --- api/v1/serializers/course.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index 197d4a0e..1c9efa96 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -389,6 +389,13 @@ class CommentSerializer(serializers.ModelSerializer): 'update_at', ) + read_only_fields = ( + 'id', + 'deactivated_at', + 'created_at', + 'update_at', + ) + def to_representation(self, instance): if isinstance(instance, CourseComment): return CourseCommentSerializer(instance, context=self.context).to_representation(instance) @@ -407,6 +414,10 @@ class CourseCommentSerializer(serializers.ModelSerializer): 'children', ) + read_only_fields = CommentSerializer.Meta.read_only_fields + ( + 'children', + ) + class LessonCommentSerializer(serializers.ModelSerializer): author = UserSerializer() @@ -418,3 +429,7 @@ class LessonCommentSerializer(serializers.ModelSerializer): 'lesson', 'children', ) + + read_only_fields = CommentSerializer.Meta.read_only_fields + ( + 'children', + ) From 28aa159c83cdd1595a017503fdbac348a532770a Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 13:11:12 +0300 Subject: [PATCH 25/73] LIL-290. Add declined_send_at field for AuthorRequest --- .../0013_authorrequest_declined_send_at.py | 18 ++++++++++++++++++ apps/user/models.py | 1 + 2 files changed, 19 insertions(+) create mode 100644 apps/user/migrations/0013_authorrequest_declined_send_at.py diff --git a/apps/user/migrations/0013_authorrequest_declined_send_at.py b/apps/user/migrations/0013_authorrequest_declined_send_at.py new file mode 100644 index 00000000..50a6a738 --- /dev/null +++ b/apps/user/migrations/0013_authorrequest_declined_send_at.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-03-13 10:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0012_authorrequest_cause'), + ] + + operations = [ + migrations.AddField( + model_name='authorrequest', + name='declined_send_at', + field=models.DateTimeField(blank=True, null=True), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index 6e2e6fef..1e8866ab 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -119,6 +119,7 @@ class AuthorRequest(models.Model): status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, default=PENDING) cause = models.TextField('Причина отказа', null=True, blank=True) + declined_send_at = models.DateTimeField(null=True, blank=True) created_at = models.DateTimeField(auto_now_add=True) update_at = models.DateTimeField(auto_now=True) From 77d25d0653ea39b4c9b0cb9d7f84aa80e0d67402 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 13:11:49 +0300 Subject: [PATCH 26/73] LIL-24. Add admin for AuthorRequest --- apps/user/admin.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/user/admin.py b/apps/user/admin.py index 76e27edc..be63ec0e 100644 --- a/apps/user/admin.py +++ b/apps/user/admin.py @@ -3,6 +3,8 @@ from django.contrib.auth import get_user_model from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.utils.translation import gettext_lazy as _ +from .models import AuthorRequest + User = get_user_model() @@ -17,3 +19,15 @@ class UserAdmin(BaseUserAdmin): (_('Important dates'), {'fields': ('last_login', 'date_joined')}), ('Social urls', {'fields': ('instagram', 'facebook', 'twitter', 'pinterest', 'youtube', 'vkontakte', )}), ) + + +@admin.register(AuthorRequest) +class AuthorRequestAdmin(admin.ModelAdmin): + list_display = ( + 'email', + 'first_name', + 'last_name', + 'status', + 'created_at', + 'update_at', + ) From d6e694556aa04f060acdc5a82923efb79b0f509d Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 14:30:39 +0300 Subject: [PATCH 27/73] LIL-290. Add accepted_send_at field for AuthorRequest --- .../0014_authorrequest_accepted_send_at.py | 18 ++++++++++++++++++ apps/user/models.py | 1 + 2 files changed, 19 insertions(+) create mode 100644 apps/user/migrations/0014_authorrequest_accepted_send_at.py diff --git a/apps/user/migrations/0014_authorrequest_accepted_send_at.py b/apps/user/migrations/0014_authorrequest_accepted_send_at.py new file mode 100644 index 00000000..284c5909 --- /dev/null +++ b/apps/user/migrations/0014_authorrequest_accepted_send_at.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-03-13 10:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0013_authorrequest_declined_send_at'), + ] + + operations = [ + migrations.AddField( + model_name='authorrequest', + name='accepted_send_at', + field=models.DateTimeField(blank=True, null=True), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index 1e8866ab..b1f34217 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -119,6 +119,7 @@ class AuthorRequest(models.Model): status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, default=PENDING) cause = models.TextField('Причина отказа', null=True, blank=True) + accepted_send_at = models.DateTimeField(null=True, blank=True) declined_send_at = models.DateTimeField(null=True, blank=True) created_at = models.DateTimeField(auto_now_add=True) update_at = models.DateTimeField(auto_now=True) From dfe7f80d93a518f0537b94b45a5612e8ea70d1ba Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 14:31:03 +0300 Subject: [PATCH 28/73] Set send_email async --- apps/notification/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/notification/utils.py b/apps/notification/utils.py index bc206a13..c04b3c0e 100644 --- a/apps/notification/utils.py +++ b/apps/notification/utils.py @@ -3,8 +3,10 @@ from twilio.rest import Client from django.core.mail import EmailMessage from django.conf import settings from django.template.loader import get_template +from project.celery import app +@app.task def send_email(subject, to_email, template_name, **kwargs): html = get_template(template_name).render(kwargs) email = EmailMessage(subject, html, to=[to_email]) From 3beebb77247edb53ba4e6243d6de34a3809d45ff Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 14:33:36 +0300 Subject: [PATCH 29/73] LIL-292, LIL-293, LIL-304 --- .../notification/email/accept_author.html | 13 ++++++ .../notification/email/decline_author.html | 8 ++++ apps/user/admin.py | 2 + apps/user/models.py | 46 +++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 apps/notification/templates/notification/email/accept_author.html create mode 100644 apps/notification/templates/notification/email/decline_author.html diff --git a/apps/notification/templates/notification/email/accept_author.html b/apps/notification/templates/notification/email/accept_author.html new file mode 100644 index 00000000..44221ba5 --- /dev/null +++ b/apps/notification/templates/notification/email/accept_author.html @@ -0,0 +1,13 @@ +{% extends "notification/email/_base.html" %} + +{% block content %} +

Поздравляем! Вам одобрено назначение преподавателем!

+
+

Теперь вы можете публиковать курсы.

+ {% if password and email %} +

Параметры входа:

+

email: {{ email }}

+

пароль: {{ password }}

+ {% endif %} +
+{% endblock content %} diff --git a/apps/notification/templates/notification/email/decline_author.html b/apps/notification/templates/notification/email/decline_author.html new file mode 100644 index 00000000..d67dfe3e --- /dev/null +++ b/apps/notification/templates/notification/email/decline_author.html @@ -0,0 +1,8 @@ +{% extends "notification/email/_base.html" %} + +{% block content %} +

К сожалению вам отказано в назначении преподавателем!

+
+

{{ cause }}

+
+{% endblock content %} diff --git a/apps/user/admin.py b/apps/user/admin.py index be63ec0e..5440f146 100644 --- a/apps/user/admin.py +++ b/apps/user/admin.py @@ -28,6 +28,8 @@ class AuthorRequestAdmin(admin.ModelAdmin): 'first_name', 'last_name', 'status', + 'accepted_send_at', + 'declined_send_at', 'created_at', 'update_at', ) diff --git a/apps/user/models.py b/apps/user/models.py index b1f34217..7ccbf2dc 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -6,9 +6,11 @@ from django.db.models.signals import post_save from django.dispatch import receiver from django.contrib.auth.models import AbstractUser, UserManager from django.contrib.postgres import fields as pgfields +from django.utils.timezone import now from django.utils.translation import gettext_lazy as _ from api.v1 import serializers +from apps.notification.utils import send_email class User(AbstractUser): @@ -130,3 +132,47 @@ class AuthorRequest(models.Model): verbose_name = 'Заявка не преподавателя' verbose_name_plural = 'Заявки не преподавателя' ordering = ('-created_at',) + + +@receiver(post_save, sender=AuthorRequest) +def handle_authorrequest_update(sender, instance=None, created=False, update_fields=[], **kwargs): + if not created: + if instance.status == AuthorRequest.DECLINED and not instance.declined_send_at: + send_email.delay( + 'Отказ заявки на преподавателя', + instance.email, + 'notification/email/decline_author.html', + cause=instance.cause, + ) + instance.declined_send_at = now() + instance.save() + elif instance.status == AuthorRequest.ACCEPTED and not instance.accepted_send_at: + email = None + password = None + try: + user = User.objects.get(email=instance.email) + except User.DoesNotExist: + email = instance.email + password = User.objects.make_random_password() + user = User.objects.create( + first_name=instance.first_name, + last_name=instance.last_name, + username=instance.email, + email=instance.email, + about=instance.about, + facebook=instance.facebook, + is_active=True, + is_email_proved=True, + ) + user.set_password(password) + user.role = User.AUTHOR_ROLE + user.save() + send_email.delay( + 'Заявка на преподавателя одобрена', + instance.email, + 'notification/email/accept_author.html', + email=email, + password=password, + ) + instance.accepted_send_at = now() + instance.save() From 282860132aa90e6b19552222946d272130b71759 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 14:44:38 +0300 Subject: [PATCH 30/73] LIL-24. Fix AuthorRequestSerializer --- api/v1/serializers/user.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/v1/serializers/user.py b/api/v1/serializers/user.py index 896af2dd..d548da19 100644 --- a/api/v1/serializers/user.py +++ b/api/v1/serializers/user.py @@ -66,12 +66,17 @@ class AuthorRequestSerializer(serializers.ModelSerializer): 'about', 'facebook', 'status', + 'cause', + 'accepted_send_at', + 'declined_send_at', 'created_at', 'update_at', ) read_only_fields = ( 'id', + 'accepted_send_at', + 'declined_send_at', 'created_at', 'update_at', ) From 6b534a33c8d9dcbeb201987577ae0d951d54c948 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 14:53:55 +0300 Subject: [PATCH 31/73] LIL-24. Add filtering AuthorRequest by status --- api/v1/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/api/v1/views.py b/api/v1/views.py index db0d8754..4a854b78 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -349,3 +349,4 @@ class AuthorRequestViewSet(ExtendedModelViewSet): queryset = AuthorRequest.objects.all() serializer_class = AuthorRequestSerializer permission_classes = (IsAdmin,) + filter_fields = ('status',) From 87dbf333a2b85aee225a647e219fddc079af7a73 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 15:09:55 +0300 Subject: [PATCH 32/73] LIL-309. Fix success payment templates --- .../payment/course_payment_success.html | 12 ++++++++++++ apps/payment/views.py | 16 +++++++++++++++- project/urls.py | 9 +++++++-- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 apps/payment/templates/payment/course_payment_success.html diff --git a/apps/payment/templates/payment/course_payment_success.html b/apps/payment/templates/payment/course_payment_success.html new file mode 100644 index 00000000..3edd1879 --- /dev/null +++ b/apps/payment/templates/payment/course_payment_success.html @@ -0,0 +1,12 @@ +{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %} +
+
+
+
Вы успешно приобрели курс!
+
+ ПЕРЕЙТИ К КУРСУ +
+
+
+
+{% endblock content %} diff --git a/apps/payment/views.py b/apps/payment/views.py index 52ccd274..10392769 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -23,6 +23,20 @@ from .models import AuthorBalance, CoursePayment, SchoolPayment logger = logging.getLogger('django') +@method_decorator(login_required, name='dispatch') +class CourseBuySuccessView(TemplateView): + template_name = 'payment/course_payment_success.html' + + def get(self, request, pk=None, *args, **kwargs): + course = Course.objects.get(id=pk) + return self.render_to_response(context={'course': course}) + + +@method_decorator(login_required, name='dispatch') +class SchoolBuySuccessView(TemplateView): + template_name = 'payment/payment_success.html' + + @method_decorator(login_required, name='dispatch') class CourseBuyView(TemplateView): template_name = 'payment/paymentwall_widget.html' @@ -52,7 +66,7 @@ class CourseBuyView(TemplateView): 'evaluation': 1, 'demo': 1, 'test_mode': 1, - 'success_url': host + str(reverse_lazy('payment-success')), + 'success_url': host + str(reverse_lazy('course_payment_success', args=[course.id])), 'failure_url': host + str(reverse_lazy('payment-error')), } ) diff --git a/project/urls.py b/project/urls.py index bdb2290d..57d948cd 100644 --- a/project/urls.py +++ b/project/urls.py @@ -29,7 +29,11 @@ from apps.user.views import ( UserEditView, NotificationEditView, PaymentHistoryView, resend_email_verify, ) -from apps.payment.views import CourseBuyView, PaymentwallCallbackView, SchoolBuyView +from apps.payment.views import ( + CourseBuySuccessView, CourseBuyView, + PaymentwallCallbackView, SchoolBuySuccessView, + SchoolBuyView, +) from .views import IndexView @@ -52,7 +56,8 @@ urlpatterns = [ path('lesson//comment', lessoncomment, name='lessoncomment'), path('payments/ping', PaymentwallCallbackView.as_view(), name='payment-ping'), path('paymentwall/pingback', PaymentwallCallbackView.as_view(), name='payment-ping-second'), - path('payments/success', TemplateView.as_view(template_name='payment/payment_success.html'), name='payment-success'), + path('payments/course//success', CourseBuySuccessView.as_view(), name='course_payment_success'), + path('payments/school/success', SchoolBuySuccessView.as_view(), name='payment-success'), path('payments/error', TemplateView.as_view(template_name='payment/payment_error.html'), name='payment-error'), path('school/checkout', SchoolBuyView.as_view(), name='school-checkout'), path('search/', SearchView.as_view(), name='search'), From e7b46433ffc2f38fb326b1675d1efe58c9d0959c Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 15:13:15 +0300 Subject: [PATCH 33/73] Show 404 if course not found in CourseBuySuccessView --- apps/payment/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/payment/views.py b/apps/payment/views.py index 10392769..3e3165ab 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -6,7 +6,7 @@ from datetime import timedelta from django.contrib import messages from django.contrib.auth.decorators import login_required from django.http import HttpResponse -from django.shortcuts import redirect +from django.shortcuts import redirect, get_object_or_404 from django.views.generic import View, TemplateView from django.views.decorators.csrf import csrf_exempt from django.urls import reverse_lazy @@ -28,7 +28,7 @@ class CourseBuySuccessView(TemplateView): template_name = 'payment/course_payment_success.html' def get(self, request, pk=None, *args, **kwargs): - course = Course.objects.get(id=pk) + course = get_object_or_404(Course, pk=pk) return self.render_to_response(context={'course': course}) From 397032595d639b7494e7d0161f1f0ab37edd5597 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 13 Mar 2018 18:50:08 +0300 Subject: [PATCH 34/73] LIL-301, 302 --- apps/payment/tasks.py | 18 +++++++++++++++++ apps/payment/views.py | 47 ++++++++++++++++++++++++++----------------- apps/user/models.py | 14 +++++++++++++ apps/user/tasks.py | 20 ++++++++++++++++++ project/settings.py | 3 +++ 5 files changed, 83 insertions(+), 19 deletions(-) create mode 100644 apps/payment/tasks.py create mode 100644 apps/user/tasks.py diff --git a/apps/payment/tasks.py b/apps/payment/tasks.py new file mode 100644 index 00000000..e5a3f296 --- /dev/null +++ b/apps/payment/tasks.py @@ -0,0 +1,18 @@ +from mixpanel import Mixpanel + +from django.conf import settings + +from project.celery import app + + +@app.task +def transaction_to_mixpanel(user_id, amount, time, product_type): + mix = Mixpanel(settings.MIX_TOKEN) + mix.people_track_charge( + user_id, + amount, + { + '$time': time, + 'product_type': product_type, + } + ) diff --git a/apps/payment/views.py b/apps/payment/views.py index 3e3165ab..e7490ad9 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -17,6 +17,7 @@ from paymentwall import Pingback, Product, Widget from apps.course.models import Course from apps.school.models import SchoolSchedule +from apps.payment.tasks import transaction_to_mixpanel from .models import AuthorBalance, CoursePayment, SchoolPayment @@ -146,27 +147,35 @@ class PaymentwallCallbackView(View): logger.info( json.dumps(payment_raw_data), ) + payment.status = pingback.get_type() payment.data = payment_raw_data - if pingback.is_deliverable() and product_type_name == 'school': - school_payment = SchoolPayment.objects.filter( - user=payment.user, - date_start__lte=now(), - date_end__gt=now(), - status__in=[ - Pingback.PINGBACK_TYPE_REGULAR, - Pingback.PINGBACK_TYPE_GOODWILL, - Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED, - ], - ).last() - if school_payment: - date_start = school_payment.date_end + timedelta(days=1) - date_end = date_start + timedelta(days=30) - else: - date_start = now() - date_end = now() + timedelta(days=30) - payment.date_start = date_start - payment.date_end = date_end + if pingback.is_deliverable(): + transaction_to_mixpanel.delay( + payment.user.id, + payment.amount, + now().strftime('%Y-%m-%dT%H:%M:%S'), + product_type_name, + ) + if product_type_name == 'school': + school_payment = SchoolPayment.objects.filter( + user=payment.user, + date_start__lte=now(), + date_end__gt=now(), + status__in=[ + Pingback.PINGBACK_TYPE_REGULAR, + Pingback.PINGBACK_TYPE_GOODWILL, + Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED, + ], + ).last() + if school_payment: + date_start = school_payment.date_end + timedelta(days=1) + date_end = date_start + timedelta(days=30) + else: + date_start = now() + date_end = now() + timedelta(days=30) + payment.date_start = date_start + payment.date_end = date_end payment.save() author_balance = getattr(payment, 'author_balance', None) diff --git a/apps/user/models.py b/apps/user/models.py index 7ccbf2dc..dd0ad0a1 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -12,6 +12,8 @@ from django.utils.translation import gettext_lazy as _ from api.v1 import serializers from apps.notification.utils import send_email +from apps.user.tasks import user_to_mixpanel + class User(AbstractUser): USER_ROLE = 0 @@ -89,6 +91,18 @@ def create_auth_token(sender, instance=None, created=False, **kwargs): instance.auth_token.delete() +@receiver(post_save, sender=User) +def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs): + user_to_mixpanel.delay( + instance.id, + instance.email, + instance.first_name, + instance.last_name, + instance.date_joined, + instance.role, + ) + + class AuthorRequestManager(models.Manager): def create_by_user(self, user): obj = self.model( diff --git a/apps/user/tasks.py b/apps/user/tasks.py new file mode 100644 index 00000000..110bf976 --- /dev/null +++ b/apps/user/tasks.py @@ -0,0 +1,20 @@ +from mixpanel import Mixpanel + +from django.conf import settings + +from project.celery import app + + +@app.task +def user_to_mixpanel(user_id, email, first_name, last_name, date_joined, role): + mix = Mixpanel(settings.MIX_TOKEN) + mix.people_set( + user_id, + { + '$email': email, + '$first_name': first_name, + '$last_name': last_name, + '$created': date_joined, + 'role': role, + } + ) diff --git a/project/settings.py b/project/settings.py index 6860b3d0..c4ea30c7 100644 --- a/project/settings.py +++ b/project/settings.py @@ -270,6 +270,9 @@ else: Paymentwall.set_app_key('d6f02b90cf6b16220932f4037578aff7') Paymentwall.set_secret_key('4ea515bf94e34cf28646c2e12a7b8707') +# Mixpanel settings +MIX_TOKEN = '79bd6bfd98667ed977737e6810b8abcd' + # CORS settings if DEBUG: From 5012f42786b086f7ddf4d726ae41c2f0d212cd7e Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Wed, 14 Mar 2018 10:12:57 +0300 Subject: [PATCH 35/73] Add card field to AuthorBalanceSerializer --- api/v1/serializers/payment.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/v1/serializers/payment.py b/api/v1/serializers/payment.py index 9174177d..d005a88d 100644 --- a/api/v1/serializers/payment.py +++ b/api/v1/serializers/payment.py @@ -16,6 +16,7 @@ class AuthorBalanceCreateSerializer(serializers.ModelSerializer): 'commission', 'status', 'payment', + 'card', 'cause', ) @@ -43,6 +44,7 @@ class AuthorBalanceSerializer(serializers.ModelSerializer): 'commission', 'status', 'payment', + 'card', 'cause', ) From 11c9384453dcb0e4386ff864465989f53f42ca96 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Wed, 14 Mar 2018 16:18:08 +0700 Subject: [PATCH 36/73] fix avatar, card format --- web/src/sass/_common.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 4d66e5d8..66166011 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -778,6 +778,7 @@ a[name] &__pic display: block width: 100% + height: 100% border-radius: 50% &__input position: absolute From 2b17eafb86423c377a37f2bcd09b3289fbdb5e6b Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 09:35:57 +0300 Subject: [PATCH 37/73] LIL-287. Add SubscriptionCategory & EmailSubscription models --- apps/user/admin.py | 16 ++++++- .../migrations/0015_auto_20180315_0547.py | 45 +++++++++++++++++++ .../migrations/0016_auto_20180315_0603.py | 20 +++++++++ .../0017_subscriptioncategory_auto_add.py | 18 ++++++++ apps/user/models.py | 37 ++++++++++++++- 5 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 apps/user/migrations/0015_auto_20180315_0547.py create mode 100644 apps/user/migrations/0016_auto_20180315_0603.py create mode 100644 apps/user/migrations/0017_subscriptioncategory_auto_add.py diff --git a/apps/user/admin.py b/apps/user/admin.py index 5440f146..77d060dc 100644 --- a/apps/user/admin.py +++ b/apps/user/admin.py @@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.utils.translation import gettext_lazy as _ -from .models import AuthorRequest +from .models import AuthorRequest, EmailSubscription, SubscriptionCategory User = get_user_model() @@ -33,3 +33,17 @@ class AuthorRequestAdmin(admin.ModelAdmin): 'created_at', 'update_at', ) + + +@admin.register(SubscriptionCategory) +class SubscriptionCategoryAdmin(admin.ModelAdmin): + list_display = ('title',) + + +@admin.register(EmailSubscription) +class EmailSubscriptionAdmin(admin.ModelAdmin): + list_display = ( + 'id', + 'user', + 'email', + ) diff --git a/apps/user/migrations/0015_auto_20180315_0547.py b/apps/user/migrations/0015_auto_20180315_0547.py new file mode 100644 index 00000000..dddc43d5 --- /dev/null +++ b/apps/user/migrations/0015_auto_20180315_0547.py @@ -0,0 +1,45 @@ +# Generated by Django 2.0.3 on 2018-03-15 05:47 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0014_authorrequest_accepted_send_at'), + ] + + operations = [ + migrations.CreateModel( + name='EmailSubscription', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')), + ('mailchimp_status', models.PositiveSmallIntegerField(choices=[(0, 'error'), (1, 'sent')], default=0)), + ], + ), + migrations.CreateModel( + name='SubscriptionCategory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=100)), + ], + options={ + 'verbose_name': 'Категория подписки', + 'verbose_name_plural': 'Категории подписки', + 'ordering': ('title',), + }, + ), + migrations.AddField( + model_name='emailsubscription', + name='categories', + field=models.ManyToManyField(to='user.SubscriptionCategory'), + ), + migrations.AddField( + model_name='emailsubscription', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/apps/user/migrations/0016_auto_20180315_0603.py b/apps/user/migrations/0016_auto_20180315_0603.py new file mode 100644 index 00000000..3c5d3f47 --- /dev/null +++ b/apps/user/migrations/0016_auto_20180315_0603.py @@ -0,0 +1,20 @@ +# Generated by Django 2.0.3 on 2018-03-15 06:03 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0015_auto_20180315_0547'), + ] + + operations = [ + migrations.AlterField( + model_name='emailsubscription', + name='user', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='email_subscription', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/apps/user/migrations/0017_subscriptioncategory_auto_add.py b/apps/user/migrations/0017_subscriptioncategory_auto_add.py new file mode 100644 index 00000000..9530f62c --- /dev/null +++ b/apps/user/migrations/0017_subscriptioncategory_auto_add.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-03-15 06:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0016_auto_20180315_0603'), + ] + + operations = [ + migrations.AddField( + model_name='subscriptioncategory', + name='auto_add', + field=models.BooleanField(default=False), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index dd0ad0a1..c9aad8e8 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -99,10 +99,21 @@ def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs): instance.first_name, instance.last_name, instance.date_joined, - instance.role, + dict(User.ROLE_CHOICES).get(instance.role), ) +@receiver(post_save, sender=User) +def auto_create_subscription(sender, instance=None, created=False, **kwargs): + if not hasattr(instance, 'email_subscription'): + instance.email_subscription = EmailSubscription.objects.create( + user=instance, + email=instance.email, + ) + instance.email_subscription.categories.set(SubscriptionCategory.objects.filter(auto_add=True)) + instance.save() + + class AuthorRequestManager(models.Manager): def create_by_user(self, user): obj = self.model( @@ -190,3 +201,27 @@ def handle_authorrequest_update(sender, instance=None, created=False, update_fie ) instance.accepted_send_at = now() instance.save() + + +class SubscriptionCategory(models.Model): + title = models.CharField(max_length=100) + auto_add = models.BooleanField(default=False) + + class Meta: + verbose_name = 'Категория подписки' + verbose_name_plural = 'Категории подписки' + ordering = ('title',) + + +class EmailSubscription(models.Model): + ERROR = 0 + SENT = 1 + MAILCHIMP_STATUS_CHOICES = ( + (ERROR, 'error'), + (SENT, 'sent'), + ) + + user = models.OneToOneField(User, null=True, blank=True, on_delete=models.CASCADE, related_name='email_subscription') + email = models.EmailField(_('email address'), unique=True) + categories = models.ManyToManyField(SubscriptionCategory) + mailchimp_status = models.PositiveSmallIntegerField(choices=MAILCHIMP_STATUS_CHOICES, default=ERROR) From f7ac50afd985e603a56c4fcb0b5649414d0ff513 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 09:36:32 +0300 Subject: [PATCH 38/73] LIL-298. Fix notification settings template --- .../templates/user/notification-settings.html | 41 ++++++------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/apps/user/templates/user/notification-settings.html b/apps/user/templates/user/notification-settings.html index e15996e5..3a486926 100644 --- a/apps/user/templates/user/notification-settings.html +++ b/apps/user/templates/user/notification-settings.html @@ -24,42 +24,25 @@ {% endif %}
-
+ {% csrf_token %}
Уведомления и рассылка
+ {% for category in subscription_categories %} - - - - - - + {% endfor %}
-
+
-{% endblock content %} \ No newline at end of file +{% endblock content %} From 80392ae7ba8c4da49dae8ff5ce47d87ae3b77359 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 09:37:03 +0300 Subject: [PATCH 39/73] Update NotificationEditView --- apps/user/views.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apps/user/views.py b/apps/user/views.py index 9f647065..3cc75cc3 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -25,6 +25,7 @@ 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 SubscriptionCategory from .forms import AuthorRequesForm, UserEditForm, WithdrawalForm from .models import AuthorRequest @@ -93,6 +94,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): From eb063f76f9764fa2deb8ef2c46cfb130203915f0 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 09:58:55 +0300 Subject: [PATCH 40/73] LIL-289. Update index template --- project/templates/lilcity/index.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index b6bb1808..ed99dd81 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -202,13 +202,15 @@
ПОДПИСАТЬСЯ НА НОВОСТИ
- +
From c80121e4b131c799e0eaa5b57ee681bd489f8ee2 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 09:59:14 +0300 Subject: [PATCH 41/73] LIL-288. Add subscribe view --- apps/user/views.py | 25 +++++++++++++++++++++++-- project/urls.py | 2 ++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/apps/user/views.py b/apps/user/views.py index 3cc75cc3..85414c27 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,10 +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 SubscriptionCategory +from apps.user.models import AuthorRequest, EmailSubscription, SubscriptionCategory from .forms import AuthorRequesForm, UserEditForm, WithdrawalForm -from .models import AuthorRequest User = get_user_model() @@ -87,6 +87,27 @@ class UserView(DetailView): return context +class SubscribeView(View): + + def post(self, request, pk=None, **kwargs): + if request.user.is_authenticated: + messages.info(request, 'Вы уже подписаны на рассылки.') + return redirect(request.get_full_path()) + 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(request.get_full_path()) + else: + messages.error(request, 'Введите адрес электронной почты.') + return redirect(request.get_full_path()) + + @method_decorator(login_required, name='dispatch') class NotificationEditView(TemplateView): template_name = 'user/notification-settings.html' diff --git a/project/urls.py b/project/urls.py index 57d948cd..b7f3dde3 100644 --- a/project/urls.py +++ b/project/urls.py @@ -28,6 +28,7 @@ from apps.user.views import ( AuthorRequestView, UserView, UserEditView, NotificationEditView, PaymentHistoryView, resend_email_verify, + SubscribeView, ) from apps.payment.views import ( CourseBuySuccessView, CourseBuyView, @@ -66,6 +67,7 @@ urlpatterns = [ path('user//notifications', NotificationEditView.as_view(), name='user-edit-notifications'), path('user//payments', PaymentHistoryView.as_view(), name='user-edit-payments'), path('user/resend-email-verify', resend_email_verify, name='resend-email-verify'), + path('subscribe', SubscribeView.as_view(), name='subscribe'), path('privacy', TemplateView.as_view(template_name='templates/lilcity/privacy_policy.html'), name='privacy'), path('terms', TemplateView.as_view(template_name='templates/lilcity/terms.html'), name='terms'), path('refund-policy', TemplateView.as_view(template_name='templates/lilcity/refund_policy.html'), name='refund_policy'), From a8f206c163400c6fa43ec305edfd95108d1d5243 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 10:04:42 +0300 Subject: [PATCH 42/73] LIL-288. Fix subscribe redirect --- apps/user/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/user/views.py b/apps/user/views.py index 85414c27..a2c9a76b 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -90,9 +90,9 @@ class UserView(DetailView): 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(request.get_full_path()) email = request.POST.get('email', None) if email: email_subscription = EmailSubscription.objects.create( @@ -102,10 +102,9 @@ class SubscribeView(View): SubscriptionCategory.objects.filter(auto_add=True) ) messages.info(request, 'Вы подписаны на новости.') - return redirect(request.get_full_path()) else: messages.error(request, 'Введите адрес электронной почты.') - return redirect(request.get_full_path()) + return redirect(refferer) @method_decorator(login_required, name='dispatch') From 3199b18ac7e4cd26285cf9ab0dffd8942a7b5cca Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 10:16:32 +0300 Subject: [PATCH 43/73] Add subscribtion categories fixture --- .../fixtures/subscription_categories.json | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 apps/user/fixtures/subscription_categories.json diff --git a/apps/user/fixtures/subscription_categories.json b/apps/user/fixtures/subscription_categories.json new file mode 100644 index 00000000..07b3fd10 --- /dev/null +++ b/apps/user/fixtures/subscription_categories.json @@ -0,0 +1,58 @@ +[ + { + "model": "user.subscriptioncategory", + "pk": 1, + "fields": { + "title": "Новости школы", + "auto_add": false + } + }, + { + "model": "user.subscriptioncategory", + "pk": 2, + "fields": { + "title": "Новые курсы", + "auto_add": true + } + }, + { + "model": "user.subscriptioncategory", + "pk": 3, + "fields": { + "title": "Бонусы от партнёров", + "auto_add": false + } + }, + { + "model": "user.subscriptioncategory", + "pk": 4, + "fields": { + "title": "Акции", + "auto_add": true + } + }, + { + "model": "user.subscriptioncategory", + "pk": 5, + "fields": { + "title": "Партнёрские акции", + "auto_add": false + } + }, + { + "model": "user.subscriptioncategory", + "pk": 6, + "fields": { + "title": "Новости компании", + "auto_add": true + } + }, + { + "model": "user.subscriptioncategory", + "pk": 7, + "fields": { + "title": "Комментарии в которых участвуете", + "auto_add": false + } + } +] From c7aec233eeaddbe6639616b9358c9a31c5c9bb52 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 10:39:30 +0300 Subject: [PATCH 44/73] Fix subscribe messages --- apps/user/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/user/views.py b/apps/user/views.py index a2c9a76b..d98bcc07 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -93,6 +93,7 @@ class SubscribeView(View): 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( @@ -102,9 +103,10 @@ class SubscribeView(View): SubscriptionCategory.objects.filter(auto_add=True) ) messages.info(request, 'Вы подписаны на новости.') + return redirect(refferer) else: messages.error(request, 'Введите адрес электронной почты.') - return redirect(refferer) + return redirect(refferer) @method_decorator(login_required, name='dispatch') From 317db4a86fdf68daf8c0ecba3398726665029a82 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 11:21:16 +0300 Subject: [PATCH 45/73] Add user subscriptions categories to mixpanel --- apps/user/models.py | 4 ++++ apps/user/tasks.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/user/models.py b/apps/user/models.py index c9aad8e8..f4c56536 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -100,6 +100,7 @@ def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs): instance.last_name, instance.date_joined, dict(User.ROLE_CHOICES).get(instance.role), + [subscription.title.lower() for subscription in instance.email_subscription.categories.all()] if hasattr(instance, 'email_subscription') else [], ) @@ -212,6 +213,9 @@ class SubscriptionCategory(models.Model): verbose_name_plural = 'Категории подписки' ordering = ('title',) + def __str__(self): + return self.title + class EmailSubscription(models.Model): ERROR = 0 diff --git a/apps/user/tasks.py b/apps/user/tasks.py index 110bf976..702c804e 100644 --- a/apps/user/tasks.py +++ b/apps/user/tasks.py @@ -6,7 +6,7 @@ from project.celery import app @app.task -def user_to_mixpanel(user_id, email, first_name, last_name, date_joined, role): +def user_to_mixpanel(user_id, email, first_name, last_name, date_joined, role, subscriptions): mix = Mixpanel(settings.MIX_TOKEN) mix.people_set( user_id, @@ -16,5 +16,6 @@ def user_to_mixpanel(user_id, email, first_name, last_name, date_joined, role): '$last_name': last_name, '$created': date_joined, 'role': role, + 'subscriptions': subscriptions, } ) From f8b0d68bb371859b77022e544cdaca82ef8291e6 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 12:39:48 +0300 Subject: [PATCH 46/73] LIL-306. Add token based auth for navigate to edit from admin page --- apps/auth/middleware.py | 18 ++++++++++++++++++ project/settings.py | 1 + 2 files changed, 19 insertions(+) create mode 100644 apps/auth/middleware.py diff --git a/apps/auth/middleware.py b/apps/auth/middleware.py new file mode 100644 index 00000000..1c737a93 --- /dev/null +++ b/apps/auth/middleware.py @@ -0,0 +1,18 @@ +from django.contrib.auth import login +from django.utils.deprecation import MiddlewareMixin + +from rest_framework.authtoken.models import Token + + +class TokenAuthLoginMiddleware(MiddlewareMixin): + + def process_request(self, request): + if 'token' in request.GET: + token = request.GET.get('token') + if token: + try: + token = Token.objects.get(key=token) + user = token.user + login(request, user) + except Token.DoesNotExist: + pass diff --git a/project/settings.py b/project/settings.py index c4ea30c7..a9e02e83 100644 --- a/project/settings.py +++ b/project/settings.py @@ -73,6 +73,7 @@ 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'] From cb388de77565bdd4be60e584a37e44e7a5600a5f Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 13:28:34 +0300 Subject: [PATCH 47/73] LIL-316. Add school schedules print page --- project/templates/lilcity/main.html | 2 +- .../templates/lilcity/school_schedules.html | 52 +++++++++++++++++++ project/urls.py | 3 +- project/views.py | 9 ++++ 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 project/templates/lilcity/school_schedules.html diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html index 817a23f6..f0af1cd6 100644 --- a/project/templates/lilcity/main.html +++ b/project/templates/lilcity/main.html @@ -367,7 +367,7 @@ {% endfor %}
- Распечатать расписание чтобы не забыть
+ Распечатать расписание чтобы не забыть
{% if course_items %} diff --git a/project/templates/lilcity/school_schedules.html b/project/templates/lilcity/school_schedules.html new file mode 100644 index 00000000..88601188 --- /dev/null +++ b/project/templates/lilcity/school_schedules.html @@ -0,0 +1,52 @@ +{% load static %} + + + + + + + + + + + +
+
+ +
Расписание
+ +
+ {% for school_schedule in school_schedules %} +
+
{{ school_schedule }}
+
+
{{ school_schedule.title }}
+
{{ school_schedule.description }}
+
+ +
{{ school_schedule.materials }}
+
+
+
+ {% endfor %} +
+ {% comment %}
+ Распечатать расписание чтобы не забыть +
{% endcomment %} +
+
+ + + + diff --git a/project/urls.py b/project/urls.py index b7f3dde3..b0c6ddb8 100644 --- a/project/urls.py +++ b/project/urls.py @@ -36,7 +36,7 @@ from apps.payment.views import ( SchoolBuyView, ) -from .views import IndexView +from .views import IndexView, SchoolSchedulesView urlpatterns = [ path('admin/', admin.site.urls), @@ -71,6 +71,7 @@ urlpatterns = [ path('privacy', TemplateView.as_view(template_name='templates/lilcity/privacy_policy.html'), name='privacy'), path('terms', TemplateView.as_view(template_name='templates/lilcity/terms.html'), name='terms'), path('refund-policy', TemplateView.as_view(template_name='templates/lilcity/refund_policy.html'), name='refund_policy'), + path('school-schedules', SchoolSchedulesView.as_view(), name='school_schedules'), path('', IndexView.as_view(), name='index'), path('api/v1/', include(('api.v1.urls', 'api_v1'))), path('test', TemplateView.as_view(template_name='templates/lilcity/test.html'), name='test'), diff --git a/project/views.py b/project/views.py index 9dafb0a4..fcedb726 100644 --- a/project/views.py +++ b/project/views.py @@ -14,3 +14,12 @@ class IndexView(TemplateView): 'school_schedules': SchoolSchedule.objects.all(), }) return context + + +class SchoolSchedulesView(TemplateView): + template_name = 'templates/lilcity/school_schedules.html' + + def get_context_data(self): + context = super().get_context_data() + context['school_schedules'] = SchoolSchedule.objects.all() + return context From 7fa8a6ca4600617c8e4736cca3f9e12d0e60c830 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 14:06:49 +0300 Subject: [PATCH 48/73] LIL-315. Fix user icon in comment block --- apps/course/templates/course/course.html | 4 ++-- apps/course/templates/course/lesson.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html index 5f7a00c8..a2787322 100644 --- a/apps/course/templates/course/course.html +++ b/apps/course/templates/course/course.html @@ -409,11 +409,11 @@
Задавайте вопросы:
- {% if user.is_authenticated %} + {% if request.user.is_authenticated %}
- +
В ответ на diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html index 9286f106..abd108b2 100644 --- a/apps/course/templates/course/lesson.html +++ b/apps/course/templates/course/lesson.html @@ -33,7 +33,7 @@ {% else %} - {% endif %} + {% endif %} @@ -97,10 +97,10 @@
Задавайте вопросы:
- {% if user.is_authenticated %} + {% if request.user.is_authenticated %}
- +
From 9416e3e978243f12239de345a610d075a193c725 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 14:24:47 +0300 Subject: [PATCH 49/73] Fix user photo if not found --- apps/course/templates/course/course.html | 9 ++++++++- apps/course/templates/course/lesson.html | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html index a2787322..4426225e 100644 --- a/apps/course/templates/course/course.html +++ b/apps/course/templates/course/course.html @@ -413,7 +413,14 @@
- +
В ответ на diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html index abd108b2..480d7d33 100644 --- a/apps/course/templates/course/lesson.html +++ b/apps/course/templates/course/lesson.html @@ -100,7 +100,14 @@ {% if request.user.is_authenticated %}
- +
From 8fc40c43d3b6194fcadf954980349eaa3a85c7d6 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 15:13:46 +0300 Subject: [PATCH 50/73] Fix cource user perms --- apps/course/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/course/views.py b/apps/course/views.py index 68fd1b1a..caa3bd5f 100644 --- a/apps/course/views.py +++ b/apps/course/views.py @@ -185,7 +185,7 @@ class CourseView(DetailView): def get(self, request, *args, **kwargs): response = super().get(request, *args, **kwargs) context = self.get_context_data() - if not request.user.is_authenticated or (not request.user.is_authenticated and self.object.status != Course.PUBLISHED) or\ + if (not request.user.is_authenticated and self.object.status != Course.PUBLISHED) or\ (request.user.is_authenticated and request.user.role not in [User.AUTHOR_ROLE, User.ADMIN_ROLE] and self.object.author != request.user and self.only_lessons and not context['paid']): raise Http404 return response From df7a99168d8f6005073553093a8c8937786ddb6d Mon Sep 17 00:00:00 2001 From: Sanasol Date: Thu, 15 Mar 2018 19:25:41 +0700 Subject: [PATCH 51/73] style import fix --- web/src/sass/app.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/sass/app.sass b/web/src/sass/app.sass index 020d748e..82cdc94a 100755 --- a/web/src/sass/app.sass +++ b/web/src/sass/app.sass @@ -2,4 +2,4 @@ @import helpers/all @import generated/sprite-svg @import common -@import '../../node_modules/baguettebox.js/src/baguetteBox.scss' +@import '~baguettebox.js/dist/baguetteBox.min.css'; \ No newline at end of file From acef8ab30a5b5528584c5ec380d41d72fac9b3b3 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Mar 2018 20:31:25 +0300 Subject: [PATCH 52/73] LIL-320. Add phone to user model --- api/v1/serializers/user.py | 6 +++++- apps/user/forms.py | 3 +++ apps/user/migrations/0018_user_phone.py | 19 +++++++++++++++++++ apps/user/models.py | 3 +++ apps/user/tasks.py | 3 ++- .../user/templates/user/profile-settings.html | 9 +++++++++ requirements.txt | 1 + 7 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 apps/user/migrations/0018_user_phone.py diff --git a/api/v1/serializers/user.py b/api/v1/serializers/user.py index d548da19..fe316cf5 100644 --- a/api/v1/serializers/user.py +++ b/api/v1/serializers/user.py @@ -1,6 +1,8 @@ -from django.contrib.auth import get_user_model +from phonenumber_field.serializerfields import PhoneNumberField from rest_framework import serializers +from django.contrib.auth import get_user_model + from . import Base64ImageField from apps.user.models import AuthorRequest @@ -8,6 +10,7 @@ User = get_user_model() class UserSerializer(serializers.ModelSerializer): + phone = PhoneNumberField() class Meta: model = User @@ -15,6 +18,7 @@ class UserSerializer(serializers.ModelSerializer): 'id', 'username', 'email', + 'phone', 'first_name', 'last_name', 'is_staff', diff --git a/apps/user/forms.py b/apps/user/forms.py index f2933c70..2445d522 100644 --- a/apps/user/forms.py +++ b/apps/user/forms.py @@ -1,5 +1,6 @@ from django import forms from django.contrib.auth import get_user_model +from phonenumber_field.formfields import PhoneNumberField from .fields import CreditCardField @@ -10,6 +11,7 @@ class UserEditForm(forms.ModelForm): # first_name = forms.CharField() # last_name = forms.CharField() # email = forms.CharField() + phone = PhoneNumberField() # city = forms.CharField() # country = forms.CharField() birthday = forms.DateField(input_formats=['%d.%m.%Y'], required=False) @@ -33,6 +35,7 @@ class UserEditForm(forms.ModelForm): 'first_name', 'last_name', 'email', + 'phone', 'city', 'country', 'birthday', diff --git a/apps/user/migrations/0018_user_phone.py b/apps/user/migrations/0018_user_phone.py new file mode 100644 index 00000000..d377bcf5 --- /dev/null +++ b/apps/user/migrations/0018_user_phone.py @@ -0,0 +1,19 @@ +# Generated by Django 2.0.3 on 2018-03-15 17:19 + +from django.db import migrations +import phonenumber_field.modelfields + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0017_subscriptioncategory_auto_add'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='phone', + field=phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, null=True, unique=True), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index f4c56536..57ec8cd2 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -1,5 +1,6 @@ from json import dumps from rest_framework.authtoken.models import Token +from phonenumber_field.modelfields import PhoneNumberField from django.db import models from django.db.models.signals import post_save @@ -33,6 +34,7 @@ class User(AbstractUser): (FEMALE, 'Женщина'), ) email = models.EmailField(_('email address'), unique=True) + phone = PhoneNumberField(null=True, blank=True, unique=True) role = models.PositiveSmallIntegerField( 'Роль', default=0, choices=ROLE_CHOICES) gender = models.CharField( @@ -96,6 +98,7 @@ def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs): user_to_mixpanel.delay( instance.id, instance.email, + str(instance.phone), instance.first_name, instance.last_name, instance.date_joined, diff --git a/apps/user/tasks.py b/apps/user/tasks.py index 702c804e..a95988be 100644 --- a/apps/user/tasks.py +++ b/apps/user/tasks.py @@ -6,12 +6,13 @@ from project.celery import app @app.task -def user_to_mixpanel(user_id, email, first_name, last_name, date_joined, role, subscriptions): +def user_to_mixpanel(user_id, email, phone, first_name, last_name, date_joined, role, subscriptions): mix = Mixpanel(settings.MIX_TOKEN) mix.people_set( user_id, { '$email': email, + '$phone': phone, '$first_name': first_name, '$last_name': last_name, '$created': date_joined, diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html index 33baee8e..8eddef8c 100644 --- a/apps/user/templates/user/profile-settings.html +++ b/apps/user/templates/user/profile-settings.html @@ -80,6 +80,15 @@
Укажите корректно свои данные
{% endif %}
+
+
Телефон
+
+ +
+ {% if form.phone.errors %} +
Укажите корректно свои данные
+ {% endif %} +
ГОРОД
diff --git a/requirements.txt b/requirements.txt index 4faab0da..2ca79a88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ django-constance[database]==2.1.0 django-filter==2.0.0.dev1 django-mptt==0.9.0 django-silk==2.0.0 +django-phonenumber-field==2.0.0 django-polymorphic-tree==1.5 djangorestframework==3.7.7 drf-yasg[validation]==1.5.0 From 5dfed1f73daa68123432029d17517a7462515309 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 12:20:40 +0300 Subject: [PATCH 53/73] Fix course slug --- api/v1/serializers/course.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index 1c9efa96..7f45c7a2 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -88,7 +88,7 @@ class CourseCreateSerializer(DispatchContentMixin, ): title = serializers.CharField(allow_blank=True) short_description = serializers.CharField(allow_blank=True) - slug = serializers.SlugField(allow_unicode=True, allow_blank=True, required=False) + slug = serializers.SlugField(allow_unicode=True, allow_blank=True, allow_null=True, required=False) content = serializers.ListSerializer( child=ContentCreateSerializer(), required=False, From ed7e888b86041f485e6a46e01db215b35c8c8572 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 12:58:29 +0300 Subject: [PATCH 54/73] LIL-314. Fix gallery images --- apps/course/templates/course/content/gallery.html | 12 ++++++++---- project/settings.py | 1 + requirements.txt | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/course/templates/course/content/gallery.html b/apps/course/templates/course/content/gallery.html index 32a4bf91..fd0d1389 100644 --- a/apps/course/templates/course/content/gallery.html +++ b/apps/course/templates/course/content/gallery.html @@ -1,10 +1,13 @@ +{% load thumbnail %} {% if results %}
Галерея итогов обучения
{% for image in course.gallery.gallery_images.all %}
- + {% thumbnail image.img.image "140x140" crop="center" as im %} + + {% endthumbnail %}
{% endfor %} @@ -15,9 +18,10 @@ {% for image in content.gallery_images.all %}
- - + {% thumbnail image.img.image "140x140" crop="center" as im %} + + {% endthumbnail %}
{% endfor %}
-{% endif %} \ No newline at end of file +{% endif %} diff --git a/project/settings.py b/project/settings.py index a9e02e83..25bd6e03 100644 --- a/project/settings.py +++ b/project/settings.py @@ -52,6 +52,7 @@ INSTALLED_APPS = [ 'corsheaders', 'constance', 'constance.backends.database', + 'sorl.thumbnail', ] + [ 'apps.auth.apps', 'apps.user', diff --git a/requirements.txt b/requirements.txt index 2ca79a88..cf55c8a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,9 +16,10 @@ drf-yasg[validation]==1.5.0 facepy==1.0.9 gunicorn==19.7.1 mixpanel==4.3.2 -requests==2.18.4 psycopg2-binary==2.7.4 Pillow==5.0.0 +requests==2.18.4 +sorl-thumbnail==12.4.1 twilio==6.10.5 # paymentwall-python==1.0.7 git+https://github.com/ivlevdenis/paymentwall-python.git From f9c96c654c34ce2224c03701cddf56319fd2b3ae Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 13:15:53 +0300 Subject: [PATCH 55/73] Fix gallery template --- apps/course/templates/course/content/gallery.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/course/templates/course/content/gallery.html b/apps/course/templates/course/content/gallery.html index fd0d1389..0d751dc6 100644 --- a/apps/course/templates/course/content/gallery.html +++ b/apps/course/templates/course/content/gallery.html @@ -20,7 +20,8 @@ {% thumbnail image.img.image "140x140" crop="center" as im %} - {% endthumbnail %} + {% endthumbnail %} +
{% endfor %}
From cbfd47c77217b85e12c0da85d630f837c3c359d5 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 13:16:28 +0300 Subject: [PATCH 56/73] LIL-319. Fix course preview img --- apps/course/templates/course/_items.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/course/templates/course/_items.html b/apps/course/templates/course/_items.html index 260a482e..2fd55a31 100644 --- a/apps/course/templates/course/_items.html +++ b/apps/course/templates/course/_items.html @@ -1,3 +1,4 @@ +{% load thumbnail %} {% load static %} {% load data_liked from data_liked %} @@ -8,9 +9,11 @@ > {% if course.cover %} - + {% thumbnail course.cover.image "300x170" crop="center" as im %} + + {% endthumbnail %} {% else %} - + {% endif %}
Подробнее
{% if course.is_featured %} @@ -86,4 +89,4 @@
-
\ No newline at end of file +
From 4026f04044cd3aa434f0fe1c272f3dc93e23677b Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 13:22:24 +0300 Subject: [PATCH 57/73] Use empty tag for img thumbs --- apps/course/templates/course/_items.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/course/templates/course/_items.html b/apps/course/templates/course/_items.html index 2fd55a31..33312e53 100644 --- a/apps/course/templates/course/_items.html +++ b/apps/course/templates/course/_items.html @@ -8,13 +8,11 @@ {% if course.is_deferred_start %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %} > - {% if course.cover %} {% thumbnail course.cover.image "300x170" crop="center" as im %} - {% endthumbnail %} - {% else %} + {% empty %} - {% endif %} + {% endthumbnail %}
Подробнее
{% if course.is_featured %}
From 3fcde043876d6951098ef6f566d89a0b00426838 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 14:07:08 +0300 Subject: [PATCH 58/73] LIL-294. Add uuid field to content block --- api/v1/serializers/content.py | 5 +++++ apps/content/migrations/0015_content_uuid.py | 18 ++++++++++++++++++ apps/content/models.py | 1 + 3 files changed, 24 insertions(+) create mode 100644 apps/content/migrations/0015_content_uuid.py diff --git a/api/v1/serializers/content.py b/api/v1/serializers/content.py index c01a2c65..e576912b 100644 --- a/api/v1/serializers/content.py +++ b/api/v1/serializers/content.py @@ -61,6 +61,7 @@ class ImageCreateSerializer(serializers.ModelSerializer): model = Image fields = ( 'id', + 'uuid', 'course', 'lesson', 'title', @@ -93,6 +94,7 @@ class TextCreateSerializer(serializers.ModelSerializer): model = Text fields = ( 'id', + 'uuid', 'course', 'lesson', 'title', @@ -124,6 +126,7 @@ class ImageTextCreateSerializer(serializers.ModelSerializer): model = ImageText fields = ( 'id', + 'uuid', 'course', 'lesson', 'title', @@ -157,6 +160,7 @@ class VideoCreateSerializer(serializers.ModelSerializer): model = Video fields = ( 'id', + 'uuid', 'course', 'lesson', 'title', @@ -212,6 +216,7 @@ class GallerySerializer(serializers.ModelSerializer): model = Gallery fields = ( 'id', + 'uuid', 'course', 'lesson', 'title', diff --git a/apps/content/migrations/0015_content_uuid.py b/apps/content/migrations/0015_content_uuid.py new file mode 100644 index 00000000..54a1997c --- /dev/null +++ b/apps/content/migrations/0015_content_uuid.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-03-16 11:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('content', '0014_auto_20180215_1503'), + ] + + operations = [ + migrations.AddField( + model_name='content', + name='uuid', + field=models.UUIDField(blank=True, null=True), + ), + ] diff --git a/apps/content/models.py b/apps/content/models.py index 345221f4..5c0b9b66 100644 --- a/apps/content/models.py +++ b/apps/content/models.py @@ -17,6 +17,7 @@ class ImageObject(models.Model): class Content(PolymorphicModel): + uuid = models.UUIDField(null=True, blank=True) course = models.ForeignKey( 'course.Course', on_delete=models.CASCADE, null=True, blank=True, From 75954748c20bb705ebc742aee77b80d74811692a Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 14:19:28 +0300 Subject: [PATCH 59/73] LIL-308. Only authors & admins in author balance req --- api/v1/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/v1/views.py b/api/v1/views.py index 4a854b78..8aaf84b8 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -55,7 +55,9 @@ User = get_user_model() class AuthorBalanceViewSet(ExtendedModelViewSet): - queryset = AuthorBalance.objects.all() + queryset = AuthorBalance.objects.filter( + author__role__in=[User.AUTHOR_ROLE, User.ADMIN_ROLE], + ) serializer_class = AuthorBalanceCreateSerializer serializer_class_map = { 'list': AuthorBalanceSerializer, From 1f286028800bd5fd9e34f3309b28eee5b25a8264 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 15:27:02 +0300 Subject: [PATCH 60/73] LIL-312. Use fix school amount calc --- apps/payment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/payment/models.py b/apps/payment/models.py index 5ec8e1ac..d3b42c8c 100644 --- a/apps/payment/models.py +++ b/apps/payment/models.py @@ -157,7 +157,7 @@ class SchoolPayment(Payment): models.Sum('month_price'), ) month_price_sum = aggregate.get('month_price__sum', 0) - if len(self.weekdays) > 7: + if month_price_sum > config.SERVICE_DISCOUNT_MIN_AMOUNT: discount = config.SERVICE_DISCOUNT else: discount = 0 From e63c7c076a508f14c2889a2d4b8e177e3c16dddc Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 15:38:55 +0300 Subject: [PATCH 61/73] LIL-317. Add SCHOOL_LOGO_IMAGE config field --- api/v1/serializers/config.py | 1 + project/settings.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py index e17ce57e..31269d66 100644 --- a/api/v1/serializers/config.py +++ b/api/v1/serializers/config.py @@ -19,6 +19,7 @@ class ConfigSerializer(serializers.Serializer): INSTAGRAM_CLIENT_ACCESS_TOKEN = serializers.CharField(required=False) INSTAGRAM_CLIENT_SECRET = serializers.CharField(required=False) INSTAGRAM_PROFILE_URL = serializers.CharField(required=False) + SCHOOL_LOGO_IMAGE = serializers.ImageField(required=False) def to_representation(self, instance): ret = OrderedDict() diff --git a/project/settings.py b/project/settings.py index 25bd6e03..59b1f339 100644 --- a/project/settings.py +++ b/project/settings.py @@ -231,6 +231,9 @@ CELERY_BEAT_SCHEDULE = { # Dynamic settings CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend' +CONSTANCE_ADDITIONAL_FIELDS = { + 'image_field': ['django.forms.ImageField', {}] +} CONSTANCE_CONFIG = OrderedDict(( ('INSTAGRAM_CLIENT_ACCESS_TOKEN', ('7145314808.f6fa114.ce354a5d876041fc9d3db04b0045587d', '')), ('INSTAGRAM_CLIENT_SECRET', ('2334a921425140ccb180d145dcd35b25', '')), @@ -240,6 +243,7 @@ CONSTANCE_CONFIG = OrderedDict(( ('SERVICE_COMMISSION', (10, 'Комиссия сервиса в процентах.')), ('SERVICE_DISCOUNT_MIN_AMOUNT', (3500, 'Минимальная сумма платежа для школы, после которой вычитывается скидка SERVICE_DISCOUNT.')), ('SERVICE_DISCOUNT', (1000, 'Комиссия сервиса при покупке всех дней.')), + ('SCHOOL_LOGO_IMAGE', ('default.png', 'Изображение в диалоге покупки школы', 'image_field')), )) CONSTANCE_CONFIG_FIELDSETS = OrderedDict({ @@ -247,6 +251,7 @@ CONSTANCE_CONFIG_FIELDSETS = OrderedDict({ 'SERVICE_COMMISSION', 'SERVICE_DISCOUNT_MIN_AMOUNT', 'SERVICE_DISCOUNT', + 'SCHOOL_LOGO_IMAGE', ), 'Instagram': ( 'INSTAGRAM_CLIENT_ACCESS_TOKEN', From e7f218bd6b60d36998d4be4b4ad7a8b6154d6f7e Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 16 Mar 2018 15:48:24 +0300 Subject: [PATCH 62/73] Update yarn lock file --- web/yarn.lock | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/yarn.lock b/web/yarn.lock index 06389b2f..0a35d84c 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -887,6 +887,10 @@ backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" +baguettebox.js@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/baguettebox.js/-/baguettebox.js-1.10.0.tgz#f24500b2f02433f52338cf77016ecf00cfe7f974" + balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" From ae00cb34ede15fee52bf59a5cbc51525a050b33f Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 19 Mar 2018 12:42:55 +0300 Subject: [PATCH 63/73] comments filter, new discount config and conditions --- project/templates/lilcity/index.html | 1 + web/src/js/modules/popup.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index ed99dd81..9a6ee2b2 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -500,6 +500,7 @@ {% block foot %}{% endblock foot %} diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js index db9824b1..4f39ad08 100644 --- a/web/src/js/modules/popup.js +++ b/web/src/js/modules/popup.js @@ -73,7 +73,7 @@ $(document).ready(function () { } var text = ''; - if(weekdays.length >= 7) { + if(schoolAmountForDiscount >= price) { text = ''+price+' '+(price-schoolDiscount)+'р.'; } else { text = price+'p.'; From a17e472be570207389180045d573521c6ae25b5b Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 20 Mar 2018 09:00:58 +0300 Subject: [PATCH 64/73] Disable SCHOOL_LOGO_IMAGE sretting --- api/v1/serializers/config.py | 2 +- project/settings.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py index 31269d66..f6ae89dd 100644 --- a/api/v1/serializers/config.py +++ b/api/v1/serializers/config.py @@ -19,7 +19,7 @@ class ConfigSerializer(serializers.Serializer): INSTAGRAM_CLIENT_ACCESS_TOKEN = serializers.CharField(required=False) INSTAGRAM_CLIENT_SECRET = serializers.CharField(required=False) INSTAGRAM_PROFILE_URL = serializers.CharField(required=False) - SCHOOL_LOGO_IMAGE = serializers.ImageField(required=False) + # SCHOOL_LOGO_IMAGE = serializers.ImageField(required=False) def to_representation(self, instance): ret = OrderedDict() diff --git a/project/settings.py b/project/settings.py index 59b1f339..743fb0fb 100644 --- a/project/settings.py +++ b/project/settings.py @@ -243,7 +243,7 @@ CONSTANCE_CONFIG = OrderedDict(( ('SERVICE_COMMISSION', (10, 'Комиссия сервиса в процентах.')), ('SERVICE_DISCOUNT_MIN_AMOUNT', (3500, 'Минимальная сумма платежа для школы, после которой вычитывается скидка SERVICE_DISCOUNT.')), ('SERVICE_DISCOUNT', (1000, 'Комиссия сервиса при покупке всех дней.')), - ('SCHOOL_LOGO_IMAGE', ('default.png', 'Изображение в диалоге покупки школы', 'image_field')), + # ('SCHOOL_LOGO_IMAGE', ('default.png', 'Изображение в диалоге покупки школы', 'image_field')), )) CONSTANCE_CONFIG_FIELDSETS = OrderedDict({ @@ -251,7 +251,7 @@ CONSTANCE_CONFIG_FIELDSETS = OrderedDict({ 'SERVICE_COMMISSION', 'SERVICE_DISCOUNT_MIN_AMOUNT', 'SERVICE_DISCOUNT', - 'SCHOOL_LOGO_IMAGE', + # 'SCHOOL_LOGO_IMAGE', ), 'Instagram': ( 'INSTAGRAM_CLIENT_ACCESS_TOKEN', From d12ed9ae22e4e540288cf933283c48b5923d212c Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 20 Mar 2018 09:27:18 +0300 Subject: [PATCH 65/73] Add is_deactivated filter for comments --- api/v1/views.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/api/v1/views.py b/api/v1/views.py index 8aaf84b8..909195d4 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -346,6 +346,16 @@ class CommentViewSet(ExtendedModelViewSet): serializer_class = CommentSerializer permission_classes = (IsAdmin,) + def get_queryset(self): + queryset = self.queryset + is_deactivated = self.request.query_params.get('is_deactivated', '0') + if is_deactivated == '0': + return queryset + elif is_deactivated == '1': + return queryset.filter(deactivated_at__isnull=True) + elif is_deactivated == '2': + return queryset.filter(deactivated_at__isnull=False) + class AuthorRequestViewSet(ExtendedModelViewSet): queryset = AuthorRequest.objects.all() From fd855045cfbd238149baecb3d26676239e3c998b Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 20 Mar 2018 10:56:26 +0300 Subject: [PATCH 66/73] LIL-151. Disable cache for ajax request in CoursesView --- apps/course/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/course/views.py b/apps/course/views.py index caa3bd5f..42235e27 100644 --- a/apps/course/views.py +++ b/apps/course/views.py @@ -7,6 +7,7 @@ from django.http import JsonResponse, Http404 from django.shortcuts import get_object_or_404 from django.template import loader, Context, Template from django.views.generic import View, CreateView, DetailView, ListView, TemplateView +from django.utils.cache import add_never_cache_headers from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_http_methods @@ -245,12 +246,14 @@ class CoursesView(ListView): else: prev_url = None next_url = None - return JsonResponse({ + response = JsonResponse({ 'success': True, 'content': html, 'prev_url': prev_url, 'next_url': next_url, }) + add_never_cache_headers(response) + return response else: return super().get(request, args, kwargs) From b2c03094a32cf0756eed96020a40a690420332ce Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 20 Mar 2018 11:07:34 +0300 Subject: [PATCH 67/73] LIL-226. Add sentry configs --- project/settings.py | 12 ++++++++++++ requirements.txt | 1 + sentry | 1 + 3 files changed, 14 insertions(+) create mode 160000 sentry diff --git a/project/settings.py b/project/settings.py index 743fb0fb..9785e9ca 100644 --- a/project/settings.py +++ b/project/settings.py @@ -11,10 +11,13 @@ 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 + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -53,6 +56,7 @@ INSTALLED_APPS = [ 'constance', 'constance.backends.database', 'sorl.thumbnail', + 'raven.contrib.django.raven_compat', ] + [ 'apps.auth.apps', 'apps.user', @@ -290,3 +294,11 @@ 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), +} diff --git a/requirements.txt b/requirements.txt index cf55c8a3..710cf88d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ gunicorn==19.7.1 mixpanel==4.3.2 psycopg2-binary==2.7.4 Pillow==5.0.0 +raven==6.6.0 requests==2.18.4 sorl-thumbnail==12.4.1 twilio==6.10.5 diff --git a/sentry b/sentry new file mode 160000 index 00000000..a514caf9 --- /dev/null +++ b/sentry @@ -0,0 +1 @@ +Subproject commit a514caf906fa22a66eaf6532a721a9393177d2ff From 8f6b5326e61cf02e67f5a22099fc892c921f0347 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 20 Mar 2018 11:08:04 +0300 Subject: [PATCH 68/73] Fix sentry --- sentry | 1 - 1 file changed, 1 deletion(-) delete mode 160000 sentry diff --git a/sentry b/sentry deleted file mode 160000 index a514caf9..00000000 --- a/sentry +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a514caf906fa22a66eaf6532a721a9393177d2ff From 355a7b00fc4844ddedcebbfe6d720a5db19e9b93 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 20 Mar 2018 11:53:23 +0300 Subject: [PATCH 69/73] LIL-325. Show authors in main page --- api/v1/serializers/user.py | 1 + apps/user/admin.py | 2 +- .../migrations/0019_user_show_in_mainpage.py | 18 +++++ apps/user/models.py | 1 + project/templates/lilcity/main.html | 70 ++++--------------- project/views.py | 4 ++ 6 files changed, 38 insertions(+), 58 deletions(-) create mode 100644 apps/user/migrations/0019_user_show_in_mainpage.py diff --git a/api/v1/serializers/user.py b/api/v1/serializers/user.py index fe316cf5..f334e9a5 100644 --- a/api/v1/serializers/user.py +++ b/api/v1/serializers/user.py @@ -40,6 +40,7 @@ class UserSerializer(serializers.ModelSerializer): 'is_email_proved', 'photo', 'balance', + 'show_in_mainpage', ) read_only_fields = ( diff --git a/apps/user/admin.py b/apps/user/admin.py index 77d060dc..df3e01d9 100644 --- a/apps/user/admin.py +++ b/apps/user/admin.py @@ -15,7 +15,7 @@ class UserAdmin(BaseUserAdmin): (_('Personal info'), {'fields': ('first_name', 'last_name', 'email', 'gender', 'about', 'photo')}), ('Facebook Auth data', {'fields': ('fb_id', 'fb_data', 'is_email_proved')}), (_('Permissions'), {'fields': ('role', 'is_active', 'is_staff', 'is_superuser', - 'groups', 'user_permissions')}), + 'groups', 'user_permissions', 'show_in_mainpage')}), (_('Important dates'), {'fields': ('last_login', 'date_joined')}), ('Social urls', {'fields': ('instagram', 'facebook', 'twitter', 'pinterest', 'youtube', 'vkontakte', )}), ) diff --git a/apps/user/migrations/0019_user_show_in_mainpage.py b/apps/user/migrations/0019_user_show_in_mainpage.py new file mode 100644 index 00000000..e624bba1 --- /dev/null +++ b/apps/user/migrations/0019_user_show_in_mainpage.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2018-03-20 08:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0018_user_phone'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='show_in_mainpage', + field=models.BooleanField(default=False, verbose_name='Показывать на главной странице'), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index 57ec8cd2..058df6b6 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -55,6 +55,7 @@ class User(AbstractUser): 'Верифицирован по email', default=False ) photo = models.ImageField('Фото', null=True, blank=True, upload_to='users') + show_in_mainpage = models.BooleanField('Показывать на главной странице', default=False) USERNAME_FIELD = 'email' REQUIRED_FIELDS = ['username'] diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html index f0af1cd6..4b2623fd 100644 --- a/project/templates/lilcity/main.html +++ b/project/templates/lilcity/main.html @@ -270,74 +270,30 @@
+ {% for author in authors %}
+ {% if author.photo %} + + {% else %} + {% endif %}
-
Саша Крю, +
{{ author.get_full_name }}, #lil_персонаж
-
@sashakru
+ {% if author.instagram %} +
{{ author.instagram }}
+ {% endif %} + {% if author.about %}
-

Закончила ПХУ им К.А.Савицкого художник театра и кино. Работала с крупнейшими российскими и зарубежными - издательствами.

-

Участник и победитель международных выставок.

-

Основатель компании "Lil City".

-
-
-
-
-
- -
-
-
Саша Крю, - #lil_персонаж -
-
@sashakru
-
-

Закончила ПХУ им К.А.Савицкого художник театра и кино. Работала с крупнейшими российскими и зарубежными - издательствами.

-

Участник и победитель международных выставок.

-

Основатель компании "Lil City".

-
-
-
-
-
- -
-
-
Саша Крю, - #lil_персонаж -
-
@sashakru
-
-

Закончила ПХУ им К.А.Савицкого художник театра и кино. Работала с крупнейшими российскими и зарубежными - издательствами.

-

Участник и победитель международных выставок.

-

Основатель компании "Lil City".

-
-
-
-
-
- -
-
-
Саша Крю, - #lil_персонаж -
-
@sashakru
-
-

Закончила ПХУ им К.А.Савицкого художник театра и кино. Работала с крупнейшими российскими и зарубежными - издательствами.

-

Участник и победитель международных выставок.

-

Основатель компании "Lil City".

+ {{ author.about }}
+ {% endif %}
+ {% endfor %}
Если хотите к нам в команду, то отправьте нам заявку
diff --git a/project/views.py b/project/views.py index fcedb726..035a5962 100644 --- a/project/views.py +++ b/project/views.py @@ -1,8 +1,11 @@ from django.views.generic import TemplateView +from django.contrib.auth import get_user_model from apps.course.models import Course from apps.school.models import SchoolSchedule +User = get_user_model() + class IndexView(TemplateView): template_name = 'templates/lilcity/main.html' @@ -12,6 +15,7 @@ class IndexView(TemplateView): context.update({ 'course_items': Course.objects.filter(status=Course.PUBLISHED)[:3], 'school_schedules': SchoolSchedule.objects.all(), + 'authors': User.objects.filter(role=User.AUTHOR_ROLE, show_in_mainpage=True), }) return context From 98de6fcdb0de38886fe754e5ee688689370792f2 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Thu, 22 Mar 2018 11:49:06 +0300 Subject: [PATCH 70/73] comments anchor position --- apps/course/templates/course/blocks/comment.html | 3 ++- web/src/sass/_common.sass | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/course/templates/course/blocks/comment.html b/apps/course/templates/course/blocks/comment.html index 463536af..497c398d 100644 --- a/apps/course/templates/course/blocks/comment.html +++ b/apps/course/templates/course/blocks/comment.html @@ -1,6 +1,7 @@ {% load static %} {% if not node.deactivated_at %} -
+ +
{% if node.author.photo %}
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 66166011..e1279091 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -2488,6 +2488,11 @@ a.grey-link width: 100% .questions + &__anchor + display: block; + position: relative; + top: -110px; + visibility: hidden; &__form, &__item display: flex From 72cdbcb4f276a7e6caf6ca2f55df8ff700f3192d Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 22 Mar 2018 12:54:06 +0300 Subject: [PATCH 71/73] LIL-326. Add min school price --- project/templates/lilcity/main.html | 2 +- project/views.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html index 4b2623fd..61fef12c 100644 --- a/project/templates/lilcity/main.html +++ b/project/templates/lilcity/main.html @@ -13,7 +13,7 @@ {% endif %} class="main__btn btn" href="#" - >КУПИТЬ ДОСТУП ОТ 2000р. в мес. + >КУПИТЬ ДОСТУП ОТ {{ min_school_price }}р. в мес.
{% if messages %} diff --git a/project/views.py b/project/views.py index 035a5962..6f73fff7 100644 --- a/project/views.py +++ b/project/views.py @@ -1,5 +1,6 @@ -from django.views.generic import TemplateView +from django.db.models import Min from django.contrib.auth import get_user_model +from django.views.generic import TemplateView from apps.course.models import Course from apps.school.models import SchoolSchedule @@ -15,6 +16,7 @@ class IndexView(TemplateView): context.update({ 'course_items': Course.objects.filter(status=Course.PUBLISHED)[:3], 'school_schedules': SchoolSchedule.objects.all(), + 'min_school_price': SchoolSchedule.objects.all().aggregate(Min('month_price'))['month_price__min'], 'authors': User.objects.filter(role=User.AUTHOR_ROLE, show_in_mainpage=True), }) return context From d4aed0aead1532ba02b683f28c103b11701ea20a Mon Sep 17 00:00:00 2001 From: Sanasol Date: Thu, 22 Mar 2018 12:57:16 +0300 Subject: [PATCH 72/73] discount min price fix --- web/src/js/modules/popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js index 4f39ad08..feaa8a8a 100644 --- a/web/src/js/modules/popup.js +++ b/web/src/js/modules/popup.js @@ -73,7 +73,7 @@ $(document).ready(function () { } var text = ''; - if(schoolAmountForDiscount >= price) { + if(schoolAmountForDiscount <= price) { text = ''+price+' '+(price-schoolDiscount)+'р.'; } else { text = price+'p.'; From 30f446331d474fa6d45adfc895be912bb9f27c14 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Thu, 22 Mar 2018 13:42:42 +0300 Subject: [PATCH 73/73] phone mask --- apps/user/templates/user/profile-settings.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html index 8eddef8c..f5f2e9fe 100644 --- a/apps/user/templates/user/profile-settings.html +++ b/apps/user/templates/user/profile-settings.html @@ -83,7 +83,7 @@
Телефон
- +
{% if form.phone.errors %}
Укажите корректно свои данные
@@ -259,4 +259,11 @@ var openFile = function(file) { reader.readAsDataURL(input.files[0]); }; + {% endblock content %} + +{% block foot %} + +{% endblock foot %} \ No newline at end of file