Merge branch 'dev' into 'master'

Dev

See merge request lilcity/backend!14

apps/school/templates/school/livelessons_list.html

@@ -1,28 +1,35 @@
-{% extends "templates/lilcity/index.html" %}
-{% load jsonify from jsonify_queryset %}
-
-{% load static %} {% block content %}
+{% extends "templates/lilcity/index.html" %} {% load jsonify from jsonify_queryset %} {% load static %} {% block content %}
 <div class="main" style="background-image: url({% static 'img/bg-1.jpg' %});">
   <div class="main__center center">
-    <div class="main__title">Онлайн-курсы LilCity</div>
+    <div class="main__title">Уроки онлайн-школы LilCity</div>
   </div>
 </div>
 <div class="section">
   <div class="section__center center center_sm">
-
-    <lessons-admin :lessons="{{livelesson_list | jsonify:"id,title,short_description,date"}}"></lessons-admin>
-
-    <!--<ul>-->
-    <!--{% for livelesson in livelesson_list %}-->
-    <!--<li>{{ livelesson.title }} <a href="{% url 'school:lessons-edit' livelesson.id %}">Редактировать</a></li>-->
-    <!--{% endfor %}-->
-    <!--</ul>-->
+    <div class="kit__body">
+      <div class="lessons__list">
+        {% for livelesson in livelesson_list %}
+        <div class="lessons__item" v-for="(lesson, index) in lessons">
+          <div class="lessons__actions lessons__actions__no-hover">
+            <a target="_blank" class="lessons__action" href="{% url 'school:lesson-detail' livelesson.id %}">
+              <svg class="icon icon-eye">
+                <use xlink:href="{% static 'img/sprite.svg' %}#icon-eye"></use>
+              </svg>
+            </a>
+            <a class="lessons__action" href="{% url 'school:lessons-edit' livelesson.id %}">
+              <svg class="icon icon-edit">
+                <use xlink:href="{% static 'img/sprite.svg' %}#icon-edit"></use>
+              </svg>
+            </a>
+          </div>
+          <div class="lessons__subtitle subtitle">{{ livelesson.date }} // {{ livelesson.title }}</div>
+          <div class="lessons__row">
+            <div class="lessons__content">{{ livelesson.short_description }}</div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+    </div>
   </div>
 </div>
 {% endblock content %}
-
-
-{% block foot %}
-<script type="text/javascript" src="{% static 'lessonsAdmin.js' %}"></script>
-<!--<link rel="stylesheet" href="{% static 'courseRedactor.css' %}" />-->
-{% endblock foot %}

project/templates/blocks/header.html

@@ -33,7 +33,7 @@
             </a>
           </div>
           <div class="header__group">
-            <a class="header__section header__section_sub js-header-section {% active_link 'courses' %}" href="{% url 'courses' %}">ВИДЕОКУРСЫ</a>
+            <a class="header__section header__section_sub js-header-section {% active_link 'courses' %}" href="{% url 'courses' %}">ВИДЕО-КУРСЫ</a>
             <div class="header__list js-header-list">
               {% category_menu_items category %}
             </div>

project/templates/blocks/last_courses.html

@@ -1,7 +1,7 @@
 {% load static %} {% if course_items %}
 <div class="section section_courses">
   <div class="section__center center">
-    <div class="title title_center">Видеокурсы без расписания</div>
+    <div class="title title_center">Видео-курсы без расписания</div>
     <div class="text text_courses">Если вам не совсем удобно заниматься с нами в прямом эфире каждый день как в нашей онлайн-школе, специально для вас мы
       делаем отдельные уроки в записи, которые вы можете проходить когда вам будем удобно.</div>
     <div class="head">

web/src/components/LessonsAdmin.vue

@@ -1,76 +0,0 @@
-<template>
-    <div>
-        <div class="kit__body">
-            <div class="lessons__list">
-                <div class="lessons__item" v-for="(lesson, index) in lessons">
-                    <div class="lessons__actions lessons__actions__no-hover">
-                        <!--<button type="button" class="lessons__action" @click="removeLesson(lesson.pk)">-->
-                            <!--<svg class="icon icon-delete">-->
-                                <!--<use xlink:href="/static/img/sprite.svg#icon-delete"></use>-->
-                            <!--</svg>-->
-                        <!--</button>-->
-                        <button type="button" class="lessons__action" @click="editLesson(lesson.pk)">
-                            <svg class="icon icon-edit">
-                                <use xlink:href="/static/img/sprite.svg#icon-edit"></use>
-                            </svg>
-                        </button>
-                    </div>
-                    <div class="lessons__subtitle subtitle">{{ moment(lesson.fields.date).format("dd, D MMM") }} // {{ lesson.fields.title }}</div>
-                    <div class="lessons__row">
-                        <div class="lessons__content">{{ lesson.fields.short_description }}</div>
-                    </div>
-                </div>
-            </div>
-            <div class="lessons__foot">
-                <button type="button" class="lessons__btn btn btn_md" @click="addLesson">СОЗДАТЬ УРОК</button>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    // import { ROLE_ADMIN, ROLE_AUTHOR } from './consts'
-    // import LinkInput from './inputs/LinkInput'
-    // import DatePicker from 'vuejs-datepicker'
-    // import BlockText from './blocks/BlockText'
-    // import BlockImage from './blocks/BlockImage'
-    // import BlockImages from './blocks/BlockImages'
-    // import BlockImageText from './blocks/BlockImageText'
-    // import BlockVideo from './blocks/BlockVideo'
-    // import LilSelect from "./inputs/LilSelect";
-    // import LessonRedactor from "./LessonRedactor";
-    // import {api} from "../js/modules/api";
-    // import BlockAdd from "./blocks/BlockAdd";
-    // import $ from 'jquery';
-    // import {required, minValue, numeric, url } from 'vuelidate/lib/validators'
-    // import slugify from 'slugify';
-    // import Draggable from 'vuedraggable';
-    import {showNotification} from "../js/modules/notification";
-    // import createHistory from "history/createBrowserHistory";
-    import moment from 'moment'
-    // import _ from 'lodash'
-    moment.locale('ru');
-
-    export default {
-        name: "leessons-admin",
-        props: ["lessons"],
-        mounted() {
-        },
-        data() {
-            return {
-                moment: moment
-            }
-        },
-        methods: {
-            addLesson() {
-                window.location = '/course/create/live';
-            },
-            editLesson(id) {
-                window.location = '/school/lessons/'+id+'/edit';
-            },
-            removeLesson(id) {
-                showNotification('error', '<p>Вжух и удалили!<sup style="vertical-align: super;">(на самом деле нет)</sup></p>');
-            }
-        }
-    }
-</script>

web/src/js/lessons-admin.js

@@ -1,16 +0,0 @@
-import Vue from 'vue'
-import 'babel-polyfill'
-import LessonsAdmin from '../components/LessonsAdmin.vue'
-
-if (process.env.NODE_ENV === 'development') {
-    // Enable vue-devtools
-    Vue.config.devtools = true;
-}
-
-
-let app = new Vue({
-    el: '#lilcity-vue-app',
-    components: {
-        'lessons-admin': LessonsAdmin,
-    }
-});

web/webpack.config.js

@@ -9,7 +9,6 @@ module.exports = {
   entry: {
     app: "./src/js/app.js",
     courseRedactor: "./src/js/course-redactor.js",
-    lessonsAdmin: "./src/js/lessons-admin.js",
     mixpanel: "./src/js/third_party/mixpanel-2-latest.js",
     sprite: glob('./src/icons/*.svg'),
     images: glob('./src/img/*'),