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

Merge branch 'hotfix/LIL-715' into 'master'

Browse Source 
LIL-715 Не работает галерея работ

See merge request lilcity/backend!227
remotes/origin/editis_13-01-19
cfwme 7 years ago
parent 9ebc515a50 71a583df7c
commit 2f0b71e368
6 changed files with 65 additions and 61 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. 4
      apps/user/templates/user/edit-gallery.html
  2. 4
      project/templates/blocks/lil_store_js.html
  3. 11
      web/src/js/app.js
  4. 103
      web/src/js/modules/common.js
  5. 2
      web/src/js/modules/profile.js
  6. 2
      web/src/js/user-gallery-edit.js

4
apps/user/templates/user/edit-gallery.html
Unescape View File

@ -13,7 +13,7 @@
{% block pre_app_js %}
<script>
window.LIL_STORE.data.user_gallery_images = [{% for img in user.gallery.gallery_images.reverse %}{
window.LIL_STORE.data.userGalleryImages = [{% for img in user.gallery.gallery_images.reverse %}{
id: {{ img.id }},
image_thumbnail_url: '{{ img.img.image_thumbnail.url }}',
image_id: {{ img.img.id }},
@ -27,7 +27,7 @@
<div class="section__center center center_sm">
<div class="title">Редактировать работы</div>
<div>
<block-images :images="$root.store.data.user_gallery_images" :access-token="$root.store.accessToken" no-title="1"/>
<block-images :images="$root.store.data.userGalleryImages" :access-token="$root.store.accessToken" no-title="1"/>
</div>
<a href="#" id="gallery-save" class="btn">Сохранить</a>
</div>

4
project/templates/blocks/lil_store_js.html
Unescape View File

@ -33,5 +33,9 @@
isGiftCertificateUrl: {{ is_gift_certificate_url|yesno:"true,false" }},
},
data: {},
urlIs: (urlPatternName) => {
return window.location.pathname.search(window.LIL_STORE.urls[urlPatternName]) > -1;
},
isIndexPage: window.location.pathname == '/',
};
</script>

11
web/src/js/app.js
Unescape View File

@ -37,10 +37,6 @@ if (process.env.NODE_ENV === 'development') {
Vue.config.devtools = true;
}
window.urlIs = (urlPatternName) => {
return window.location.pathname.search(window.LIL_STORE.urls[urlPatternName]) > -1;
};
const components = {
UploadContestWork,
ContestWorks,
@ -50,11 +46,11 @@ const components = {
Object.assign(components, window.LIL_STORE.components);
if(urlIs('faq')){
if(window.LIL_STORE.urlIs('faq')){
const FAQ = require('../components/FAQ.vue');
components['faq'] = FAQ.default;
}
if(urlIs('userProfileEdit') || urlIs('userBonuses')){
if(window.LIL_STORE.urlIs('userProfileEdit') || window.LIL_STORE.urlIs('userBonuses')){
const profile = require("./modules/profile");
profile.main();
}
@ -64,6 +60,7 @@ const app = new Vue({
data() {
return {
store: window.LIL_STORE,
} },
}
},
components: components
});

103
web/src/js/modules/common.js
Unescape View File

@ -44,64 +44,67 @@ $(document).ready(function () {
});
//===========REVIEWS===============
const $reviews = $('.reviews');
const $reviewsWrap = $('.reviews__wrap');
const reviewImages = $reviews.data('review-images').split(',');
const reviewsHeight = $reviews.height();
let reviewsScrollInterval = null;
let reviewsScrollActive = false;
let currentReviewNum = 10;
let reviewsLoading = 0;
const reviewsScrollFn = () => {
if(! reviewsScrollActive){
clearInterval(reviewsScrollInterval);
reviewsScrollInterval = null;
}
for(let item of $reviewsWrap.find('.reviews__item')){
let $item = $(item);
if(window.LIL_STORE.isIndexPage){
const $reviews = $('.reviews');
const $reviewsWrap = $('.reviews__wrap');
const reviewImages = $reviews.data('review-images').split(',');
const reviewsHeight = $reviews.height();
let reviewsScrollInterval = null;
let reviewsScrollActive = false;
let currentReviewNum = 10;
let reviewsLoading = 0;
const reviewsScrollFn = () => {
if(! reviewsScrollActive){
clearInterval(reviewsScrollInterval);
reviewsScrollInterval = null;
}
for(let item of $reviewsWrap.find('.reviews__item')){
let $item = $(item);
let top = parseFloat($reviewsWrap.css('top'));
let marginTop = parseFloat($reviewsWrap.css('marginTop'));
if(marginTop + top + $item.outerHeight(true) >= 0){
break;
}
$reviewsWrap.css('marginTop', (marginTop + $item.outerHeight(true)) + 'px');
$item.remove();
}
let top = parseFloat($reviewsWrap.css('top'));
let marginTop = parseFloat($reviewsWrap.css('marginTop'));
if(marginTop + top + $item.outerHeight(true) >= 0){
break;
}
$reviewsWrap.css('marginTop', (marginTop + $item.outerHeight(true)) + 'px');
$item.remove();
}
let top = parseFloat($reviewsWrap.css('top'));
let marginTop = parseFloat($reviewsWrap.css('marginTop'));
$reviewsWrap.css('top', top - 100 + 'px');
if(($reviewsWrap.height() + top + marginTop < reviewsHeight + 500) && ! reviewsLoading){
for(let i=0; i<5; i++){
currentReviewNum = (currentReviewNum >= (reviewImages.length - 1)) ? 0 : (currentReviewNum + 1);
let $img = $(`<img class="reviews__item">`);
$img[0].src = `${window.LIL_STORE.staticUrl}img/reviews/${reviewImages[currentReviewNum]}.png`;
reviewsLoading++;
$reviewsWrap.css('top', top - 100 + 'px');
if(($reviewsWrap.height() + top + marginTop < reviewsHeight + 500) && ! reviewsLoading){
for(let i=0; i<5; i++){
currentReviewNum = (currentReviewNum >= (reviewImages.length - 1)) ? 0 : (currentReviewNum + 1);
let $img = $(`<img class="reviews__item">`);
$img[0].src = `${window.LIL_STORE.staticUrl}img/reviews/${reviewImages[currentReviewNum]}.png`;
reviewsLoading++;
$img[0].onload = () => {
reviewsLoading--;
$reviewsWrap.append($img);
};
$img[0].onload = () => {
reviewsLoading--;
$reviewsWrap.append($img);
};
}
}
}
}
};
const checkScroll = e => {
const scrollTop = window.pageYOffset;
const reviewsTop = $reviews[0].offsetTop;
if(scrollTop + window.innerHeight > reviewsTop - 200 && scrollTop < reviewsTop + reviewsHeight){
if(! reviewsScrollInterval){
reviewsScrollActive = true;
reviewsScrollInterval = setInterval(reviewsScrollFn, 3000);
reviewsScrollFn();
const checkScroll = e => {
const scrollTop = window.pageYOffset;
const reviewsTop = $reviews[0].offsetTop;
if(scrollTop + window.innerHeight > reviewsTop - 200 && scrollTop < reviewsTop + reviewsHeight){
if(! reviewsScrollInterval){
reviewsScrollActive = true;
reviewsScrollInterval = setInterval(reviewsScrollFn, 3000);
reviewsScrollFn();
}
}
else{
reviewsScrollActive = false;
}
}
else{
reviewsScrollActive = false;
}
}
$(window).scroll(checkScroll);
checkScroll();
$(window).scroll(checkScroll);
checkScroll();
}
if(window.LIL_STORE.flags.isReferralUrl){
if(window.LIL_STORE.user.id){

2
web/src/js/modules/profile.js
Unescape View File

@ -4,7 +4,7 @@ import ClipboardJS from 'clipboard';
import {showNotification} from './notification';
export const main = () => {
if(urlIs('userBonuses')){
if(window.LIL_STORE.urlIs('userBonuses')){
$('#referrer-url').select().click(function(){
$(this).select();
});

2
web/src/js/user-gallery-edit.js
Unescape View File

@ -7,7 +7,7 @@ window.LIL_STORE.components['block-images'] = BlockImages;
$(document).ready(function () {
$('#gallery-save').click(e => {
e.preventDefault();
api.saveUserGallery(window.LIL_STORE._user_gallery_images).then(response => {
api.saveUserGallery(window.LIL_STORE.data.userGalleryImages).then(response => {
window.location.href = '/user/profile/#works';
});
});

Write Preview
Loading…
Cancel
Save