From e583782565aec815aee211cfbb3f1ca3bb707811 Mon Sep 17 00:00:00 2001 From: Vitaly Baev Date: Tue, 13 Feb 2018 21:15:58 +0300 Subject: [PATCH 1/4] =?UTF-8?q?LIL-205=20-=20=D0=9A=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=88=D0=B0=D1=80=D0=B8=D0=BD=D0=B3=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D1=81=D0=BE=D1=86=D1=81=D0=B5=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/course/templates/course/course.html | 27 ++++++------------------ web/package-lock.json | 10 +++++++++ web/package.json | 4 +++- web/src/js/modules/courses.js | 4 ++++ 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html index 80b2993a..93e3b235 100644 --- a/apps/course/templates/course/course.html +++ b/apps/course/templates/course/course.html @@ -157,26 +157,13 @@
diff --git a/web/package-lock.json b/web/package-lock.json index c55c6db6..98596c94 100755 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -6101,6 +6101,11 @@ "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", "dev": true }, + "ilyabirman-likely": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ilyabirman-likely/-/ilyabirman-likely-2.3.0.tgz", + "integrity": "sha512-094983NCk9DFSdjqLhTYDGrzVC8VN5COU5qTTyh1MADZzvpT9HKQUgXejQZWIEsZjbcRoDwvMiCf61ROYuWt2Q==" + }, "immutable": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz", @@ -11742,6 +11747,11 @@ "resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-0.9.25.tgz", "integrity": "sha512-+Vldt5bl2/7tW8ScQm7eE9wVIOq7eNSGupRNLP8ej9vTR3wWz9i8fwJjWgxZ3HyGrUo4J5ki1hAzyY9cdxccoQ==" }, + "vuelidate": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.6.1.tgz", + "integrity": "sha512-QE24xV9ghPLHebe4nslzdApV4Uh8pT/tfdBmqK9GdUKOPtF+pLhPV6Q51GYaqK4+H1MBW6KedNX2Mrfi7/Oq8A==" + }, "warning": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", diff --git a/web/package.json b/web/package.json index e60f1490..b926a65a 100755 --- a/web/package.json +++ b/web/package.json @@ -56,6 +56,7 @@ "axios": "^0.17.1", "babel-polyfill": "^6.26.0", "history": "^4.7.2", + "ilyabirman-likely": "^2.3.0", "jquery": "^3.3.1", "moment": "^2.20.1", "owl.carousel": "^2.2.0", @@ -64,6 +65,7 @@ "validator": "^9.2.0", "vue": "^2.5.13", "vue-autosize": "^1.0.2", - "vuejs-datepicker": "^0.9.25" + "vuejs-datepicker": "^0.9.25", + "vuelidate": "^0.6.1" } } diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js index f47a5e21..8463c4c3 100644 --- a/web/src/js/modules/courses.js +++ b/web/src/js/modules/courses.js @@ -2,6 +2,10 @@ import $ from 'jquery'; import moment from 'moment'; import createHistory from 'history/createBrowserHistory'; +// Likely +import 'ilyabirman-likely/release/likely.css'; +import 'ilyabirman-likely/release/likely.js'; + moment.locale('ru'); // Создаем объект history API From af8b251a82cc13d15b928da2c41c744fc791abc7 Mon Sep 17 00:00:00 2001 From: Vitaly Baev Date: Tue, 13 Feb 2018 21:16:22 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20hover=20?= =?UTF-8?q?=D1=81=20=D0=BD=D0=B5=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/sass/_common.sass | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 50e0e5f7..463408e9 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -74,6 +74,10 @@ b color: white // box-shadow: 0 0 0 1px red +button + &:disabled + cursor: not-allowed + .outer display: flex min-height: 100vh @@ -114,6 +118,9 @@ b line-height: 1.33 &:hover box-shadow: 0 5px 20px 0 rgba(0,0,0,0.11) + &:disabled + &:hover + box-shadow: none &:active box-shadow: 0 0 0 0 rgba(0,0,0,0) color: rgba(#262626,.1) @@ -1913,7 +1920,7 @@ a.grey-link padding: 0 20px &__textarea display: block - height: 36px + height: auto padding: 7px 0 resize: vertical &_lg @@ -3095,6 +3102,11 @@ a.grey-link &__nav display: flex margin: 0 -10px 60px + flex-wrap: wrap + &-message + width: 100% + margin: 15px 0 0 15px + font-size: 15px &__btn margin: 0 10px flex: 0 0 calc(50% - 20px) From 8d1c274975ec842dd8ddc9f1bc64bcfcc1a350df Mon Sep 17 00:00:00 2001 From: Vitaly Baev Date: Wed, 14 Feb 2018 18:23:38 +0300 Subject: [PATCH 3/4] =?UTF-8?q?LIL-348=20-=20=D0=9F=D0=BE=D0=BB=D1=83?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=87=D0=B5=D1=80=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D0=BA=D0=B0=20=D0=BA=D1=83=D1=80=D1=81=D0=B0,=20LI?= =?UTF-8?q?L-243=20-=20=D0=90=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B5=20=D1=81=D0=BE=D1=85=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BA=D1=83=D1=80=D1=81=D0=B0?= =?UTF-8?q?,=20LIL-242=20=D0=A3=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=20=D1=81=D0=BE=D1=85=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BA=D1=83=D1=80=D1=81=D0=B0?= =?UTF-8?q?,=20LIl-239?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/templates/lilcity/edit_index.html | 4 +- web/package-lock.json | 5 + web/package.json | 1 + web/src/components/CourseRedactor.vue | 111 ++++++++++++++++++---- web/src/js/course-redactor.js | 10 ++ web/src/js/modules/api.js | 7 ++ 6 files changed, 119 insertions(+), 19 deletions(-) diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html index 8dae9b9a..b9dc4fea 100644 --- a/project/templates/lilcity/edit_index.html +++ b/project/templates/lilcity/edit_index.html @@ -46,13 +46,13 @@
-
СОХРАНЕНО
+
- +
{% if request.user.is_authenticated %}