Merge branch 'feature/LIL-582' into 'master'

Feature/lil 582

See merge request lilcity/backend!118

apps/content/admin.py

@@ -8,6 +8,7 @@ from polymorphic.admin import (
 from apps.content.models import (
     Baner, Content, Image, Text, ImageText, Video,
     Gallery, GalleryImage, ImageObject,
+    Contest,ContestWork,
 )
 
 
@@ -79,3 +80,13 @@ class ContentAdmin(PolymorphicParentModelAdmin):
 @admin.register(GalleryImage)
 class GalleryImageAdmin(admin.ModelAdmin):
     pass
+
+
+@admin.register(Contest)
+class ContestAdmin(admin.ModelAdmin):
+    base_model = Contest
+
+
+@admin.register(ContestWork)
+class ContestWorkAdmin(admin.ModelAdmin):
+    base_model = ContestWork

apps/content/templates/content/contest_work.html

@@ -1,8 +1,14 @@
 {% extends "templates/lilcity/index.html" %}
+{% load rupluralize from plural %}
 {% load static %}
-{% block title %}{{ contest_work.child_full_name }}, {{ contest_work.age }} лет{% endblock title %}
-
+{% block title %}Конкурс Lil.School{% endblock title %}
+{% block description %}Работа {{ contest_work.child_full_name }}, {{ contest_work.age | rupluralize:"год,года,лет" }}{% endblock description%}
+{% block ogdescription %}Работа {{ contest_work.child_full_name }}, {{ contest_work.age | rupluralize:"год,года,лет" }}{% endblock ogdescription %}
 {% block ogimage %}http://{{request.META.HTTP_HOST}}{{ contest_work.image.image.url }}{% endblock ogimage %}
+{% block head %}
+<meta property="og:image:height" content="{{ contest_work.image.image.height }}">
+<meta property="og:image:width" content="{{ contest_work.image.image.width }}">
+{% endblock head %}
 
 {% block content %}
 <div class="section" style="padding-bottom: 25px;">
@@ -25,7 +31,7 @@
     <div class="contest-work__info">
       <div class="contest-work__bio">
         <div>{{ contest_work.child_full_name }}</div>
-        <div class="contest-work__age">{{ contest_work.age }} {% if contest_work.age < 5 %}года{% else %}лет{% endif %}</div>
+        <div class="contest-work__age">{{ contest_work.age | rupluralize:"год,года,лет" }}</div>
       </div>
       <div class="contest-work__likes">
         <likes obj-type="contest_work" obj-id="{{ contest_work.id }}"

apps/course/templates/course/course_only_lessons.html

@@ -233,31 +233,7 @@
 </div>
 <div class="section">
   <div class="section__center center center_sm">
-    <div class="share">
-      <div class="share__title">Поделиться курсом</div>
-      <div class="share__list likely">
-        <a class="share__item facebook" href="#">
-          <svg class="icon icon-share-facebook">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
-          </svg>
-        </a>
-        <a class="share__item twitter" href="#">
-          <svg class="icon icon-share-twitter">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
-          </svg>
-        </a>
-        <a class="share__item gplus" href="#">
-          <svg class="icon icon-share-google">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
-          </svg>
-        </a>
-        <a class="share__item pinterest" href="#">
-          <svg class="icon icon-share-pinterest">
-            <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
-          </svg>
-        </a>
-      </div>
-    </div>
+    {% include 'templates/blocks/share.html' with share_object_name='курсом' %}
   </div>
 </div>
 {% endblock content %}

project/templates/blocks/share.html

@@ -1,27 +1,14 @@
 {% load static %}
 
+
 <div class="share">
   <div class="share__title">Поделиться {% if share_object_name %}{{ share_object_name }}{% else %}{% if livelesson or lesson %}уроком{% else %}курсом{% endif %}{% endif %}</div>
-  <div class="share__list likely">
-    <a class="share__item facebook" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-facebook">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
-      </svg>
-    </a>
-    <a class="share__item twitter" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-twitter">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
-      </svg>
-    </a>
-    <a class="share__item gplus" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-google">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
-      </svg>
-    </a>
-    <a class="share__item pinterest" href="#" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
-      <svg class="icon icon-share-pinterest">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
-      </svg>
-    </a>
+  <div class="share__list likely likely-big" data-url="http://{{request.META.HTTP_HOST}}{{object.get_absolute_url}}">
+    <div class="twitter"></div>
+    <div class="facebook"></div>
+    <div class="gplus"></div>
+    <div class="vkontakte"></div>
+    <div class="telegram"></div>
+    <div class="pinterest"></div>
   </div>
 </div>

project/templates/lilcity/index.html

@@ -115,6 +115,7 @@
     <noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
     <!-- /Yandex.Metrika counter -->
     {% include "templates/blocks/mixpanel.html" %}
+    {% block head %}{% endblock head %}
   </head>
   <body>
     {% include "templates/blocks/social.html" %}

web/src/components/ContestWorks.vue

@@ -1,7 +1,15 @@
 <template>
   <div class="contest-works">
     <div class="contest-works__works">
-      <contest-work v-for="contestWork in contestWorks" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      <div class="contest-works__column">
+        <contest-work v-for="contestWork in columns[0]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      </div>
+      <div class="contest-works__column">
+        <contest-work v-for="contestWork in columns[1]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      </div>
+      <div class="contest-works__column">
+        <contest-work v-for="contestWork in columns[2]" :key="contestWork.id" :contest-work="contestWork"></contest-work>
+      </div>
     </div>
     <div v-show="loading" class="contest-works__loader"><div class="loading-loader"></div></div>
     <div v-if="loaded && !contestWorks.length"  class="contest-works__no-works">Здесь вы сможете увидеть работы участников после их добавления</div>
@@ -38,6 +46,18 @@
         });
       }
     },
+    computed: {
+      columns() {
+        const first = [];
+        const second = [];
+        const third = [];
+        for(let i=0; i < this.contestWorks.length; i++) {
+          const work = this.contestWorks[i];
+          [first, second, third][i % 3].push(work);
+        }
+        return [first, second, third];
+      }
+    },
     methods: {
       load() {
         this.loading = true;
@@ -70,9 +90,13 @@
       width: 100%;
     }
     .contest-works__works {
-      column-width: 300px;
-      column-gap: 20px;
       text-align: left;
+      display: flex;
+    }
+    .contest-works__column {
+      display: flex;
+      flex-direction: column;
+      margin-right: 20px;
     }
     .contest-works__loader {
       width: 100%;

web/src/js/app.js

@@ -1,6 +1,8 @@
 /**
  * Входная точка клиентского приложения.
  */
+import 'ilyabirman-likely/release/likely.js';
+import 'ilyabirman-likely/release/likely.css';
 import "./modules/common";
 import "./modules/header";
 import "./modules/search";