mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LIL-670

Browse Source
remotes/origin/hotfix/LIL-691
gzbender 7 years ago
parent 09e3bd4315
commit aafcd1790a
8 changed files with 27 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      api/v1/views.py
  2. 26
      apps/content/templates/content/blocks/video.html
  3. 37
      apps/course/templates/course/course.html
  4. 28
      apps/course/templates/course/course_only_lessons.html
  5. 4
      apps/course/templates/course/lesson.html
  6. 2
      web/src/components/Comments.vue
  7. 3
      web/src/js/modules/api.js
  8. 18
      web/src/sass/_common.sass

3
api/v1/views.py
Unescape View File

@ -1,7 +1,7 @@
from django.contrib.auth import get_user_model
from rest_framework import status, views, viewsets, generics
from rest_framework.decorators import detail_route, list_route, action, permission_classes
from rest_framework.decorators import detail_route, list_route, action, permission_classes, authentication_classes
from rest_framework.response import Response
from . import ExtendedModelViewSet
@ -514,6 +514,7 @@ class ObjectCommentsViewSet(ExtendedModelViewSet):
print(e)
instance.delete()
@authentication_classes([])
def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset()).filter(parent__isnull=True)
serializer = self.get_serializer(queryset, many=True)

26
apps/content/templates/content/blocks/video.html
Unescape View File

@ -15,29 +15,3 @@
</div>
</div>
</div>
<style>
@media only screen and (max-width: 639px) {
iframe {
width: 100%;
height: 240px;
}
.iframe__container {
text-align: center;
width: 100%;
padding-bottom: 56.25%;
margin-bottom: -56.25%;
}
}
@media only screen and (min-width: 640px) {
.iframe__container {
text-align: center;
}
iframe {
width: 640px;
height: 360px;
}
}
</style>

37
apps/course/templates/course/course.html
Unescape View File

@ -70,7 +70,7 @@
</a>
</div>
<div class="course__title title">{{ course.title }}</div>
<div class="course__content">{{ course.short_description | linebreaks }}</div>
<div class="course__content">{{ course.short_description | safe | linebreaks }}</div>
<a href="{% url 'user' course.author.id %}">
<div class="course__user user">
{% if course.author.photo %}
@ -270,7 +270,7 @@
</a>
</div>
<div class="course__title title">{{ course.title }}</div>
<div class="course__content">{{ course.short_description | linebreaks }}</div>
<div class="course__content">{{ course.short_description | safe | linebreaks }}</div>
<a href="{% url 'user' course.author.id %}">
<div class="course__user user user_white">
{% if course.author.photo %}
@ -340,38 +340,7 @@
<div class="section__center center center_sm">
<div class="title">Задавайте вопросы:</div>
<div class="questions">
{% if request.user.is_authenticated %}
<form class="questions__form" method="post" action="{% url 'coursecomment' course_id=course.id %}">
<input type="hidden" name="reply_id">
<div class="questions__ava ava">
<img
class="ava__pic"
{% if request.user.photo %}
src="{{ request.user.photo.url }}"
{% else %}
src="{% static 'img/user_default.jpg' %}"
{% endif %}
>
</div>
<div class="questions__wrap">
<div class="questions__reply-info">В ответ на
<a href="" class="questions__reply-anchor">этот комментарий</a>.
<a href="#" class="questions__reply-cancel grey-link">Отменить</a>
</div>
<div class="questions__field">
<textarea class="questions__textarea" placeholder="Спросите автора курса интересующие вас вопросы"></textarea>
</div>
<button class="questions__btn btn btn_light">ОТПРАВИТЬ</button>
</div>
</form>
{% else %}
<div>Только зарегистрированные пользователи могут оставлять комментарии.</div>
{% endif %}
<div class="questions__list">
{% include "templates/blocks/comments.html" with object=course %}
</div>
</div>
<comments obj-type="course" obj-id="{{ course.id }}"></comments>
</div>
</div>
<div class="section">

28
apps/course/templates/course/course_only_lessons.html
Unescape View File

@ -68,7 +68,7 @@
</a>
</div>
<div class="course__title title">{{ course.title }}</div>
<div class="course__content">{{ course.short_description }}</div>
<div class="course__content">{{ course.short_description | safe | linebreaks }}</div>
<a href="{% url 'user' course.author.id %}">
<div class="course__user user">
{% if course.author.photo %}
@ -204,31 +204,7 @@
<div class="section section_gray">
<div class="section__center center center_sm">
<div class="title">Задавайте вопросы:</div>
<div class="questions">
{% if user.is_authenticated %}
<form class="questions__form" method="post" action="{% url 'coursecomment' course_id=course.id %}">
<input type="hidden" name="reply_id">
<div class="questions__ava ava">
<img class="ava__pic" src="{% static 'img/user_default.jpg' %}">
</div>
<div class="questions__wrap">
<div class="questions__reply-info">В ответ на
<a href="" class="questions__reply-anchor">этот комментарий</a>.
<a href="#" class="questions__reply-cancel grey-link">Отменить</a>
</div>
<div class="questions__field">
<textarea class="questions__textarea" placeholder="Задайте автору курса интересующие вас вопросы"></textarea>
</div>
<button class="questions__btn btn btn_light">ОТПРАВИТЬ</button>
</div>
</form>
{% else %}
<div>Только зарегистрированные пользователи могут оставлять комментарии.</div>
{% endif %}
<div class="questions__list">
{% include "templates/blocks/comments.html" with object=course %}
</div>
</div>
<comments obj-type="course" obj-id="{{ course.id }}"></comments>
</div>
</div>
<div class="section">

4
apps/course/templates/course/lesson.html
Unescape View File

@ -117,9 +117,7 @@
<div class="section section_gray">
<div class="section__center center center_sm">
<div class="title">Задавайте вопросы:</div>
<div class="questions" id="comments_block">
<comments obj-type="lesson" obj-id="{{ lesson.id }}"></comments>
</div>
<comments obj-type="lesson" obj-id="{{ lesson.id }}"></comments>
</div>
</div>
<div class="section">

2
web/src/components/Comments.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<div :class="{'questions--chat': isChat, 'questions--loading': loading}">
<div class="questions" :class="{'questions--chat': isChat, 'questions--loading': loading}">
<div v-show="nodes.length" class="questions__items">
<ul v-for="(node, index) in nodes" :key="index">
<li>

3
web/src/js/modules/api.js
Unescape View File

@ -516,9 +516,6 @@ export const api = {
obj_id: objId,
obj_type: objType,
ordering: ordering || '',
},
headers: {
'Authorization': `Token ${window.LIL_STORE.accessToken}`,
}
});
},

18
web/src/sass/_common.sass
Unescape View File

@ -4196,6 +4196,24 @@ a
max-width: 100%;
max-height: 60%;
@media only screen and (max-width: 639px)
.content-block__video iframe
width: 100%;
height: 240px;
.content-block__video.iframe__container
text-align: center;
width: 100%;
padding-bottom: 56.25%;
margin-bottom: -56.25%;
@media only screen and (min-width: 640px)
.content-block__video.iframe__container
text-align: center;
iframe
width: 640px;
height: 360px;
.banner
height: 140px

Write Preview
Loading…
Cancel
Save