Задавайте вопросы:
diff --git a/apps/course/views.py b/apps/course/views.py
index cd5fd64a..1b79be28 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -1,8 +1,9 @@
from django.contrib.auth.decorators import login_required
from django.db.models import Q
from django.http import JsonResponse
+from django.shortcuts import get_object_or_404
from django.template import loader, Context, Template
-from django.views.generic import View, CreateView, DetailView, ListView
+from django.views.generic import View, CreateView, DetailView, ListView, TemplateView
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_http_methods
from .models import Course, Like, Lesson, CourseComment, LessonComment
@@ -136,6 +137,19 @@ def lessoncomment(request, lesson_id):
})
+class CourseEditView(TemplateView):
+ template_name = 'course/course_edit.html'
+
+ def get(self, request, pk=None):
+ self.object = get_object_or_404(Course, pk=pk)
+ return super().get(request)
+
+ def get_context_data(self):
+ context = super().get_context_data()
+ context['course'] = self.object
+ return context
+
+
class CourseView(DetailView):
model = Course
context_object_name = 'course'
@@ -146,6 +160,14 @@ class CourseView(DetailView):
context['next'] = self.request.GET.get('next', None)
return context
+ def get_queryset(self):
+ queryset = super().get_queryset().select_related(
+ 'author', 'category',
+ ).prefetch_related(
+ 'likes', 'materials', 'content',
+ )
+ return queryset
+
class CoursesView(ListView):
model = Course
@@ -158,12 +180,17 @@ class CoursesView(ListView):
if request.is_ajax():
context = self.get_context_data()
template_name = self.get_template_names()
- html = loader.render_to_string(template_name, context, request=request)
+ html = loader.render_to_string(
+ template_name, context, request=request)
is_paginated = context.get('is_paginated')
if is_paginated:
page_obj = context.get('page_obj')
- prev_url = request.path + '?page=' + str(page_obj.previous_page_number()) if page_obj.has_previous() else None
- next_url = request.path + '?page=' + str(page_obj.next_page_number()) if page_obj.has_next() else None
+ prev_url = request.path + '?page=' + \
+ str(page_obj.previous_page_number()
+ ) if page_obj.has_previous() else None
+ next_url = request.path + '?page=' + \
+ str(page_obj.next_page_number()
+ ) if page_obj.has_next() else None
else:
prev_url = None
next_url = None
@@ -178,7 +205,7 @@ class CoursesView(ListView):
def get_queryset(self):
queryset = super().get_queryset().select_related(
- 'author', 'category'
+ 'author', 'category', 'cover',
).prefetch_related(
'likes', 'materials', 'content',
)
@@ -210,7 +237,8 @@ class SearchView(CoursesView):
search_query = self.request.GET.get('q', None)
queryset = super().get_queryset()
if search_query:
- query = Q(title__icontains=search_query) | Q(short_description__icontains=search_query)
+ query = Q(title__icontains=search_query) | Q(
+ short_description__icontains=search_query)
queryset = queryset.filter(query)
else:
queryset = queryset.none()
@@ -223,7 +251,8 @@ class SearchView(CoursesView):
if 'is_paginated' in context and context['is_paginated']:
page_obj = context.get('page_obj')
context['page'] = page_obj.number
- context['next_page'] = str(page_obj.next_page_number()) if page_obj.has_next() else None
+ context['next_page'] = str(
+ page_obj.next_page_number()) if page_obj.has_next() else None
else:
context['page'] = 1
context['next_page'] = None
diff --git a/apps/user/fixtures/superuser.json b/apps/user/fixtures/superuser.json
index a9118aba..eae528ed 100644
--- a/apps/user/fixtures/superuser.json
+++ b/apps/user/fixtures/superuser.json
@@ -26,7 +26,7 @@
"vkontakte": null,
"fb_id": null,
"fb_data": {},
- "is_email_proved": false,
+ "is_email_proved": true,
"photo": "",
"groups": [],
"user_permissions": []
diff --git a/apps/user/migrations/0008_auto_20180212_0750.py b/apps/user/migrations/0008_auto_20180212_0750.py
new file mode 100644
index 00000000..ccd9612e
--- /dev/null
+++ b/apps/user/migrations/0008_auto_20180212_0750.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.2 on 2018-02-12 07:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user', '0007_auto_20180207_0808'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='user',
+ options={'ordering': ('-date_joined',), 'verbose_name': 'user', 'verbose_name_plural': 'users'},
+ ),
+ ]
diff --git a/apps/user/models.py b/apps/user/models.py
index 5986e33c..db34018e 100644
--- a/apps/user/models.py
+++ b/apps/user/models.py
@@ -1,8 +1,15 @@
from django.db import models
+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.translation import gettext_lazy as _
+from rest_framework.authtoken.models import Token
+
+from json import dumps
+from api.v1 import serializers
+
class User(AbstractUser):
USER_ROLE = 0
@@ -22,8 +29,10 @@ class User(AbstractUser):
(FEMALE, 'Женщина'),
)
email = models.EmailField(_('email address'), unique=True)
- role = models.PositiveSmallIntegerField('Роль', default=0, choices=ROLE_CHOICES)
- gender = models.CharField('Пол', max_length=1, default='n', choices=GENDER_CHOICES)
+ role = models.PositiveSmallIntegerField(
+ 'Роль', default=0, choices=ROLE_CHOICES)
+ gender = models.CharField(
+ 'Пол', max_length=1, default='n', choices=GENDER_CHOICES)
birthday = models.DateField('День рождения', null=True, blank=True)
country = models.CharField('Страна', max_length=50, null=True, blank=True)
city = models.CharField('Город', max_length=85, null=True, blank=True)
@@ -36,7 +45,9 @@ class User(AbstractUser):
vkontakte = models.URLField('ВКонтакте', default='', null=True, blank=True)
fb_id = models.BigIntegerField(null=True, blank=True, unique=True)
fb_data = pgfields.JSONField(default={}, null=True, blank=True)
- is_email_proved = models.BooleanField('Верифицирован по email', default=False)
+ is_email_proved = models.BooleanField(
+ 'Верифицирован по email', default=False
+ )
photo = models.ImageField('Фото', null=True, blank=True, upload_to='users')
USERNAME_FIELD = 'email'
@@ -44,3 +55,23 @@ class User(AbstractUser):
class Meta(AbstractUser.Meta):
ordering = ('-date_joined',)
+
+ def serialized(self):
+ user_data = serializers.user.UserSerializer(instance=self).data
+ user_data = dumps(user_data, ensure_ascii=False)
+ return user_data
+
+
+@receiver(post_save, sender=User)
+def create_auth_token(sender, instance=None, created=False, **kwargs):
+ if (
+ (instance.is_active or instance.fb_id) and
+ instance.role in [User.AUTHOR_ROLE, User.ADMIN_ROLE] and not
+ hasattr(instance, 'auth_token')
+ ):
+ Token.objects.create(user=instance)
+ elif (
+ not (instance.is_active or instance.fb_id) or
+ instance.role not in [User.AUTHOR_ROLE, User.ADMIN_ROLE]
+ ) and hasattr(instance, 'auth_token'):
+ instance.auth_token.delete()
diff --git a/project/mixins.py b/project/mixins.py
new file mode 100644
index 00000000..6c6681f3
--- /dev/null
+++ b/project/mixins.py
@@ -0,0 +1,38 @@
+from django.db import models
+from django.utils import timezone
+
+
+class BaseModel(models.Model):
+
+ class Meta:
+ abstract = True
+
+
+class DeactivatedQueryset(models.Manager):
+
+ def allow_delete(self):
+ super().delete()
+
+ def delete(self):
+ count = self.count()
+ self.filter(deactivated_at__isnull=True).update(
+ deactivated_at=timezone.now()
+ )
+ return (count, None)
+
+
+class DeactivatedMixin(models.Model):
+ deactivated_at = models.DateTimeField(null=True, blank=True, default=None)
+
+ objects = DeactivatedQueryset()
+
+ class Meta:
+ abstract = True
+
+ def allow_delete(self, using=None, keep_parents=False):
+ super().delete(using=using, keep_parents=keep_parents)
+
+ def delete(self, using=None, keep_parents=False):
+ if not self.deactivated_at:
+ self.deactivated_at = timezone.now()
+ self.save()
diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index 8366692d..3978a2e8 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -15,7 +15,7 @@
-
+
@@ -135,7 +135,14 @@
{% endif %}
- {% if request.user.is_authenticated and not request.user.fb_id or request.user.is_authenticated and not request.user.is_email_proved %}
+ {% if request.user.is_authenticated %}
+ {% if not request.user.is_email_proved and not request.user.fb_id %}
{% block content %}{% endblock content %}
diff --git a/project/urls.py b/project/urls.py
index 28a51a9a..65451425 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -21,7 +21,7 @@ from django.conf import settings
from apps.course.views import (
CoursesView, likes, coursecomment,
CourseView, LessonView, SearchView,
- lessoncomment,
+ lessoncomment, CourseEditView,
)
from apps.course.models import Course
from apps.user.views import UserView, UserEditView
@@ -33,6 +33,7 @@ urlpatterns = [
path('course//', CourseView.as_view(), name='course'),
path('course//', CourseView.as_view(), name='course'),
path('course//like', likes, name='likes'),
+ path('course//edit', CourseEditView.as_view(), name='course-edit'),
path('course//comment', coursecomment, name='coursecomment'),
path('lesson//', LessonView.as_view(), name='lesson'),
path('lesson//comment', lessoncomment, name='lessoncomment'),
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 6e531c73..6da8323c 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -473,6 +473,10 @@ a.btn
color: $green-light
&:hover
color: darken($green-light,10)
+ &_gray
+ color: $gray
+ +m
+ color: $gray
&_border
margin-bottom: 5px
padding: 2px 20px 10px
@@ -3268,9 +3272,19 @@ a.grey-link
a
&.link--black
color: #000
+ &.disabled
+ pointer-events: none
+ cursor: default
+ opacity: 0.6
-
-
-
-
-
+.content-block
+ &.title
+ font-size: 24px
+ font-style: bold
+ &.text
+ font-size: 16px
+ padding-bottom: 24px
+ text-align: left
+ &.pic
+ position: relative
+ width: 100%
\ No newline at end of file
+ 
+
-