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

Merge branch 'dev' of gitlab.com:lilcity/backend into dev

Browse Source
remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 1919c7072b ef53cc17d7
commit b23420d163
4 changed files with 40 additions and 52 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. 27
      apps/course/templates/course/course.html
  2. 27
      apps/course/templates/course/lesson.html
  3. 26
      web/src/components/CourseRedactor.vue
  4. 12
      web/src/js/modules/api.js

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

@ -393,26 +393,13 @@
<div class="share">
<div class="share__title">Поделиться курсом</div>
<div class="share__list">
<a class="share__item" href="#">
<svg class="icon icon-share-facebook">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
</svg>
</a>
<a class="share__item" href="#">
<svg class="icon icon-share-twitter">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
</svg>
</a>
<a class="share__item" href="#">
<svg class="icon icon-share-google">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
</svg>
</a>
<a class="share__item" href="#">
<svg class="icon icon-share-pinterest">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
</svg>
</a>
<div class="likely">
<div class="facebook">Facebook</div>
<div class="twitter">Twitter</div>
<div class="gplus">Google+</div>
<div class="vkontakte">VK</div>
<div class="pinterest">Pinterest</div>
</div>
</div>
</div>
</div>

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

@ -117,26 +117,13 @@
<div class="share">
<div class="share__title">Поделиться уроком</div>
<div class="share__list">
<a class="share__item" href="#">
<svg class="icon icon-share-facebook">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
</svg>
</a>
<a class="share__item" href="#">
<svg class="icon icon-share-twitter">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
</svg>
</a>
<a class="share__item" href="#">
<svg class="icon icon-share-google">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
</svg>
</a>
<a class="share__item" href="#">
<svg class="icon icon-share-pinterest">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
</svg>
</a>
<div class="likely">
<div class="facebook">Facebook</div>
<div class="twitter">Twitter</div>
<div class="gplus">Google+</div>
<div class="vkontakte">VK</div>
<div class="pinterest">Pinterest</div>
</div>
</div>
</div>
</div>

26
web/src/components/CourseRedactor.vue
Unescape View File

@ -64,13 +64,13 @@
<div class="info__sidebar">
<div class="info__wrap">
<div class="info__fieldset">
<!--<div class="info__field field">
<div class="info__field field">
<div class="field__label field__label_gray">ССЫЛКА</div>
<div class="field__wrap">
<input type="text" class="field__input" v-model="course.url">
</div>
<div class="field__wrap field__wrap&#45;&#45;additional">{{ courseFullUrl }}</div>
</div>-->
<div class="field__wrap field__wrap--additional">{{ courseFullUrl }}</div>
</div>
<div class="info__field field">
<div class="field__label field__label_gray">ДОСТУП</div>
<div class="field__wrap">
@ -135,7 +135,7 @@
</div>
</div>
</div>
<div class="kit__nav">
<div id="course-redactor__nav" class="kit__nav">
<button class="kit__btn btn btn_lg"
v-bind:class="{ 'btn_stroke': viewSection === 'course', 'btn_gray': viewSection !== 'course' }"
type="button" @click="viewSection = 'course'">Описание
@ -334,7 +334,8 @@
],
showErrors: false,
savingTimeout: null,
categoryOptions: []
categoryOptions: [],
courseSyncHook: false, // Если true, то watch не будет отправлять курс на обновление
}
},
validations: {
@ -402,7 +403,7 @@
},
removeLesson(lessonIndex) {
if (!confirm('Вы действительно хотите удалить этот урок?')) {
return
return;
}
const lesson = this.lessons[lessonIndex];
if (lesson.hasOwnProperty('id') && lesson.id) {
@ -464,6 +465,10 @@
},
goToLessons() {
this.viewSection = 'lessons';
this.$nextTick(() => {
const elementTop = $('#course-redactor__nav').position().top - 130;
$(window).scrollTop(elementTop);
});
},
loadCourseDraft() {
this.courseLoading = true;
@ -528,7 +533,11 @@
this.savingTimeout = setTimeout(() => {
document.getElementById('course-redactor__saving-status').innerText = '';
}, 2000);
// this.course = api.convertCourseJson(response.data);
this.courseSyncHook = true;
this.course = api.convertCourseJson(response.data);
this.$nextTick(() => {
this.courseSyncHook = false;
})
})
.catch((err) => {
this.courseSaving = false;
@ -630,6 +639,9 @@
watch: {
'course': {
handler: function (newValue, oldValue) {
if (this.courseSyncHook) {
return;
}
this.saveCourseDraft(newValue, oldValue);
},
deep: true,

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

@ -55,9 +55,11 @@ export const api = {
let deferredStart = null;
if (courseObject.is_deferred) {
let deferredStartTime = moment(courseObject.time.value, "HH:mm");
let deferredStartDate = moment(courseObject.date).hour(deferredStartTime.hour());
deferredStart = deferredStartDate.format();
if (courseObject.date && courseObject.time && courseObject.time.value) {
let deferredStartTime = moment(courseObject.time.value, "HH:mm");
let deferredStartDate = moment(courseObject.date).hour(deferredStartTime.hour());
deferredStart = deferredStartDate.format();
}
}
const courseJson = {
@ -68,7 +70,7 @@ export const api = {
deferred_start_at: deferredStart,
duration: courseObject.duration,
is_featured: courseObject.is_featured,
url: courseObject.url,
slug: courseObject.url,
cover: courseObject.coverImageId ? courseObject.coverImageId : null,
gallery: {
gallery_images: courseObject.gallery && courseObject.gallery.images ? courseObject.gallery.images : []
@ -245,7 +247,7 @@ export const api = {
time: deferredTime ? {title: deferredTime, value: deferredTime} : null,
duration: courseJSON.duration,
is_featured: courseJSON.is_featured,
url: courseJSON.url,
url: courseJSON.slug,
coverImageId: courseJSON.cover && courseJSON.cover.id ? courseJSON.cover.id : null,
coverImage: courseJSON.cover && courseJSON.cover.image ? courseJSON.cover.image : null,
content: api.convertContentResponse(courseJSON.content),

Write Preview
Loading…
Cancel
Save