From 32d190ceb2fa0c4fdec17cf062387e30bcb98da6 Mon Sep 17 00:00:00 2001 From: gzbender Date: Tue, 4 Jun 2019 11:29:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D0=B0=D0=BF=20=D0=B2=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=86=D0=B5=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/v1/views.py | 9 +++++++++ apps/school/templates/blocks/schedule_item.html | 2 +- web/src/sass/_common.sass | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/api/v1/views.py b/api/v1/views.py index 2a9c1b0f..4bde8660 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -212,6 +212,15 @@ class LikeViewSet(ExtendedModelViewSet): headers = self.get_success_headers(serializer.data) return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) + @action(methods=['get'], detail=False, url_path='course-liked') + def course_liked(self, request): + user_id = request.query_params.get('user_id') + course_id = request.query_params.get('course_id') + course = Course.objects.get(id=course_id) + return Response({ + 'is_liked': course.likes.filter(user_id=user_id).exists() + }) + class CategoryViewSet(BothListFormatMixin, ExtendedModelViewSet): queryset = Category.objects.order_by('-id') diff --git a/apps/school/templates/blocks/schedule_item.html b/apps/school/templates/blocks/schedule_item.html index 81f79b12..66e80182 100644 --- a/apps/school/templates/blocks/schedule_item.html +++ b/apps/school/templates/blocks/schedule_item.html @@ -24,7 +24,7 @@ {% include './day_pay_btn.html' %} {% endif %} {% endif %} - {% if not is_purchased and not request.user_agent.is_mobile and school_schedule.trial_lesson and not is_drawing_camp %} + {% if not is_purchased and not request.user_agent.is_mobile and school_schedule.trial_lesson %} Пробный урок {% endif %} diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index bb9df7bf..e7b0a5b6 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -4131,8 +4131,10 @@ a.grey-link +m margin-right: 0 &__item a.timing__btn - opacity: 0; - transition: 0.5s ease; + opacity: 0; + transition: 0.5s ease + +m + opacity: 1 &__item:hover a.timing__btn opacity: 1; &__pic