diff --git a/apps/content/templates/content/contest.html b/apps/content/templates/content/contest.html
index 9edbe8ec..49a0bd19 100644
--- a/apps/content/templates/content/contest.html
+++ b/apps/content/templates/content/contest.html
@@ -45,3 +45,8 @@
{% endblock content %}
+
+{% block pre_app_js %}
+
+
+{% endblock pre_app_js %}
diff --git a/apps/content/templates/content/contest_edit.html b/apps/content/templates/content/contest_edit.html
index 409405a6..856a6d9b 100644
--- a/apps/content/templates/content/contest_edit.html
+++ b/apps/content/templates/content/contest_edit.html
@@ -12,6 +12,8 @@
{% block content %}
{% endblock content %}
-{% block foot %}
-
-{% endblock foot %}
+
+{% block pre_app_js %}
+
+
+{% endblock pre_app_js %}
diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html
index 105592a5..ef3bf9d8 100644
--- a/apps/user/templates/user/bonus-history.html
+++ b/apps/user/templates/user/bonus-history.html
@@ -79,3 +79,7 @@
{% endblock content %}
+
+{% block pre_app_js %}
+
+{% endblock pre_app_js %}
diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html
index 04eecdec..7de0e74c 100644
--- a/apps/user/templates/user/profile-settings.html
+++ b/apps/user/templates/user/profile-settings.html
@@ -323,3 +323,7 @@
// (new Inputmask('+7 (999) 999-99-99')).mask(document.querySelector('[name=phone]'));
{% endblock foot %}
+
+{% block pre_app_js %}
+
+{% endblock pre_app_js %}
diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html
index a88a7e84..074fb6e4 100644
--- a/project/templates/lilcity/edit_index.html
+++ b/project/templates/lilcity/edit_index.html
@@ -316,6 +316,7 @@
{% include 'templates/blocks/lil_store_js.html' %}
+{% block pre_app_js %}{% endblock pre_app_js %}
-
-
diff --git a/web/src/components/ContestWorks.vue b/web/src/components/ContestWorks.vue
index b0d6f493..156acf93 100644
--- a/web/src/components/ContestWorks.vue
+++ b/web/src/components/ContestWorks.vue
@@ -74,8 +74,8 @@
}
}
}
-
- heights[column] += workHeight;
+
+ heights[column] += workHeight;
[first, second, third][column].push(work);
index++;
}
@@ -112,28 +112,3 @@
components: {ContestWork},
}
-
-
diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue
index 2bd6bd65..3cfa8030 100644
--- a/web/src/components/CourseRedactor.vue
+++ b/web/src/components/CourseRedactor.vue
@@ -1074,172 +1074,4 @@
}
-
diff --git a/web/src/components/UploadContestWork.vue b/web/src/components/UploadContestWork.vue
index 326c05c4..60d5f657 100644
--- a/web/src/components/UploadContestWork.vue
+++ b/web/src/components/UploadContestWork.vue
@@ -153,41 +153,3 @@
}
}
-
-
diff --git a/web/src/components/blocks/ContestWork.vue b/web/src/components/blocks/ContestWork.vue
index 617b9fab..2cb1def9 100644
--- a/web/src/components/blocks/ContestWork.vue
+++ b/web/src/components/blocks/ContestWork.vue
@@ -25,38 +25,3 @@
components: {Likes},
}
-
-
diff --git a/web/src/js/app.js b/web/src/js/app.js
index 313141c1..9301efe8 100644
--- a/web/src/js/app.js
+++ b/web/src/js/app.js
@@ -40,23 +40,6 @@ const components = {
Comments,
FAQ,
};
-//
-//if(window.LIL_STORE.urlIs('userProfileEdit') || window.LIL_STORE.urlIs('userBonuses')){
-// const profile = require("./modules/profile");
-// profile.main();
-//}
-//if(window.LIL_STORE.urlIs(['courseEdit', 'courseCreate'])){
-// const courseEdit = require("./modules/course-redactor");
-// courseEdit.main();
-//}
-//if(window.LIL_STORE.urlIs('contestEdit')){
-// const ContestRedactor = require('../components/ContestRedactor.vue');
-// components['contest-redactor'] = ContestRedactor.default;
-//}
-//if(window.LIL_STORE.urlIs('userGalleryEdit')){
-// const userGalleryEdit = require("./modules/user-gallery-edit");
-// userGalleryEdit.main();
-//}
Object.assign(components, window.LIL_STORE.components);
diff --git a/web/src/js/pages/contest-edit.js b/web/src/js/pages/contest-edit.js
index e1daf8ef..95b05559 100644
--- a/web/src/js/pages/contest-edit.js
+++ b/web/src/js/pages/contest-edit.js
@@ -1,3 +1,5 @@
+import '../../sass/components/contest-edit.scss';
+
import ContestRedactor from '../../components/ContestRedactor.vue';
window.LIL_STORE.components['contest-redactor'] = ContestRedactor;
diff --git a/web/src/js/pages/contest.js b/web/src/js/pages/contest.js
index d5785c15..84902ebb 100644
--- a/web/src/js/pages/contest.js
+++ b/web/src/js/pages/contest.js
@@ -1,3 +1,5 @@
+import '../../sass/components/contest.scss';
+
import UploadContestWork from '../../components/UploadContestWork.vue';
import ContestWorks from '../../components/ContestWorks.vue';
diff --git a/web/src/js/pages/course-edit.js b/web/src/js/pages/course-edit.js
index e7a2fcc4..25b1545b 100644
--- a/web/src/js/pages/course-edit.js
+++ b/web/src/js/pages/course-edit.js
@@ -1,3 +1,5 @@
+import '../../sass/components/course-edit.scss';
+
import 'babel-polyfill';
import CourseRedactor from '../../components/CourseRedactor.vue';
import $ from 'jquery';
diff --git a/web/src/sass/components/contest-edit.scss b/web/src/sass/components/contest-edit.scss
new file mode 100644
index 00000000..574739d4
--- /dev/null
+++ b/web/src/sass/components/contest-edit.scss
@@ -0,0 +1,35 @@
+.upload-contest-work {
+
+ .popup__wrap {
+ padding: 35px 35px 0;
+ }
+
+ .title {
+ text-align: center; font-size: 24px;
+
+ .text__curve {
+ right: 55px;
+ width: 170px;
+ bottom: -40px;
+ }
+ }
+
+ .kit__photo {
+ height: 400px;
+ }
+
+ .kit__photo.has-image {
+ border: none;
+ }
+
+ .kit__photo-image {
+ max-height: 400px;
+ height: auto;
+ width: auto;
+ }
+
+ .kit__file {
+ bottom: 0;
+ }
+
+}
diff --git a/web/src/sass/components/contest-work.scss b/web/src/sass/components/contest-work.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/web/src/sass/components/contest.scss b/web/src/sass/components/contest.scss
new file mode 100644
index 00000000..bc243ebf
--- /dev/null
+++ b/web/src/sass/components/contest.scss
@@ -0,0 +1,55 @@
+.contest-works {
+ width: 100%;
+}
+.contest-works__works {
+ text-align: left;
+ display: flex;
+}
+.contest-works__column {
+ display: flex;
+ flex-direction: column;
+ margin-right: 20px;
+ width: 300px;
+}
+.contest-works__loader {
+ width: 100%;
+ height: 30px;
+ position: relative;
+}
+.contest-works__no-works {
+ text-align: center;
+ width: 100%;
+}
+
+.contest-work-item {
+ break-inside: avoid;
+ border-radius: 8px;
+ overflow: hidden;
+ margin-bottom: 20px;
+ transition: opacity .4s ease-in-out;
+ text-transform: uppercase;
+ font-weight: bold;
+ color: black;
+ border: 1px solid #ececec;
+ display: block;
+}
+.contest-work-item__img {
+ width: 100%;
+ height: auto;
+}
+.contest-work-item__info {
+ display: flex;
+ padding: 5px 10px;
+}
+.contest-work-item__age {
+ color: #919191;
+}
+.contest-work-item__bio {
+ flex: calc(100% - 70px);
+}
+
+@media only screen and (min-width: 1023px) {
+ .contest-works:hover .contest-work-item:not(:hover) {
+ opacity: 0.4;
+ }
+}
diff --git a/web/src/sass/components/course-edit.scss b/web/src/sass/components/course-edit.scss
new file mode 100644
index 00000000..ad1d219e
--- /dev/null
+++ b/web/src/sass/components/course-edit.scss
@@ -0,0 +1,166 @@
+.vdp-datepicker__calendar {
+ width: 240px;
+ margin-top: 10px;
+ padding: 5px;
+ background: white;
+ box-shadow: 0 2px 20px 0 rgba(0, 0, 0, 0.1);
+ z-index: 99 !important;
+
+ header {
+ display: flex;
+ margin-bottom: 5px;
+ -ms-flex-align: center;
+ align-items: center;
+ }
+
+ .prev, .next {
+ font-size: 0;
+ cursor: pointer;
+ order: 1;
+ width: auto !important;
+ padding: 10px;
+ }
+
+ .prev {
+ order: 1;
+ }
+
+ .next {
+ order: 3;
+ }
+
+ .prev:before, .next:before {
+ content: '';
+ display: block;
+ width: 10px;
+ height: 10px;
+ border: solid #E6E6E6;
+ border-width: 2px 2px 0 0;
+ }
+
+ .prev:after, .next:after {
+ content: none !important;
+ }
+
+ .prev:before {
+ transform: rotate(-135deg);
+ }
+
+ .next:before {
+ transform: rotate(45deg);
+ }
+}
+
+.kit__preview {
+ img {
+ width: 140px;
+ height: 140px;
+ }
+}
+
+.kit__photo {
+ width: 140px;
+ height: 140px;
+}
+
+.kit__section-remove {
+ button.sortable__handle {
+ margin-right: 10px;
+ cursor: -webkit-grab;
+ cursor: grab;
+
+ svg.icon-hamburger {
+ width: 1em;
+ height: 1em;
+ }
+ }
+}
+
+.sortable-ghost, .sortable-chosen {
+ background: white;
+ border-radius: 10px;
+}
+
+.course-redactor__preview-button-bg-save {
+ background-color: #58fffb;
+}
+.course-redactor__preview-button {
+ transition: backgroundColor 0.5s ease-in-out;
+}
+
+.field_text {
+ height: 270px;
+ overflow: scroll;
+}
+
+.courses__item {
+ flex: 0 0 300px;
+}
+
+.courses__item .field {
+ margin-bottom: 0;
+}
+
+.courses__content .redactor-box {
+ overflow-x: visible;
+ overflow-y: auto;
+ max-height: 200px;
+ background: none;
+ margin-top: 10px;
+}
+
+.courses__content .redactor-layer{
+ background: none;
+}
+
+.courses__theme {
+ flex: 1;
+}
+
+.courses__price {
+ margin-left: 20px;
+}
+
+.courses__preview {
+ .upload {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ }
+
+ .upload__title {
+ color: #888888;
+ font-size: 16px;
+ margin-top: 100px;
+ width: 100%;
+ text-align: center;
+ }
+
+ .upload__file {
+ width: 100%;
+ height: 100%;
+ }
+}
+
+.course-delete-cover {
+ left: 5px;
+ position: absolute;
+ bottom: 3px;
+}
+
+.field-category .select__head {
+ font-size: inherit;
+ line-height: inherit;
+ height: auto;
+}
+
+.datetime-fields {
+ display: flex;
+}
+
+.field-time {
+ margin-left: 10px;
+ flex: 50%;
+}
diff --git a/web/webpack.config.js b/web/webpack.config.js
index 886156ed..21ead790 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -21,8 +21,6 @@ module.exports = {
imagesGiftCertificates: glob('./src/img/gift-certificates/*'),
imagesReviews: glob('./src/img/reviews/*'),
fonts: glob('./src/fonts/*'),
-// pages: glob('./src/js/pages/*'),
-// pagesCss: glob('./src/sass/pages/*'),
},
output: {
path: path.join(__dirname, "build"),
@@ -34,7 +32,7 @@ module.exports = {
loaders: [
{
test: /\.js$/,
- exclude: /(node_modules|bower_components|third_party|pages)/,
+ exclude: /(node_modules|bower_components|third_party)/,
use: {
loader: 'babel-loader',
options: {
@@ -44,7 +42,7 @@ module.exports = {
},
{
test: /third_party\/.*\.js$/,
- exclude: /(node_modules|bower_components|pages)/,
+ exclude: /(node_modules|bower_components)/,
use: {
loader: 'file-loader',
options: {
@@ -52,22 +50,6 @@ module.exports = {
}
}
},
-// {
-// test: /\.js$/,
-// include: [path.resolve(__dirname, 'src/js/pages')],
-// use: [{
-// loader: 'file-loader',
-// options: {
-// name: "[name].[ext]"
-// }
-// },
-// {
-// loader: 'babel-loader',
-// options: {
-// "presets": ["es2015"],
-// }
-// }]
-// },
{
test: /\.css$/,
use: ExtractTextPlugin.extract({
@@ -77,39 +59,11 @@ module.exports = {
},
{
test: /\.s[ac]ss$/,
- exclude: [path.resolve(__dirname, 'src/sass/pages')],
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: ['css-loader', 'sass-loader']
})
},
- /* {
- test: /\.s[ac]ss$/,
- include: [path.resolve(__dirname, 'src/sass/pages')],
- use: [
- {
- loader: 'file-loader',
- options: {
- name: '[name].css',
- }
- },
- {
- loader: 'extract-loader',
- },
- {
- loader: 'css-loader',
- options: {
- sourceMap: true
- }
- },
- {
- loader: 'sass-loader',
- options: {
- sourceMap: true
- }
- }
- ]
- }, */
{
test: /\.vue$/,
loader: 'vue-loader',
@@ -174,10 +128,6 @@ module.exports = {
"window.$": "jquery"
}),
new ExtractTextPlugin('[name].css'),
-// new MiniCssExtractPlugin({
-// filename: "[name].css",
-// chunkFilename: "[id].css"
-// }),
],
resolve: {