diff --git a/apps/user/templates/user/edit-gallery.html b/apps/user/templates/user/edit-gallery.html
index e3fbf2d8..635bb522 100644
--- a/apps/user/templates/user/edit-gallery.html
+++ b/apps/user/templates/user/edit-gallery.html
@@ -13,7 +13,7 @@
{% block pre_app_js %}
diff --git a/web/src/js/app.js b/web/src/js/app.js
index d15518d6..1588467f 100644
--- a/web/src/js/app.js
+++ b/web/src/js/app.js
@@ -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
});
diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js
index 6c3cb578..00ac9414 100644
--- a/web/src/js/modules/common.js
+++ b/web/src/js/modules/common.js
@@ -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[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[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){
diff --git a/web/src/js/modules/profile.js b/web/src/js/modules/profile.js
index 141e5e0e..11f60b76 100644
--- a/web/src/js/modules/profile.js
+++ b/web/src/js/modules/profile.js
@@ -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();
});
diff --git a/web/src/js/user-gallery-edit.js b/web/src/js/user-gallery-edit.js
index f3be7c0f..8c957d11 100644
--- a/web/src/js/user-gallery-edit.js
+++ b/web/src/js/user-gallery-edit.js
@@ -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';
});
});