From 3d65806feda17fea5374aacf4d95c3f19518d63a Mon Sep 17 00:00:00 2001 From: booblegum Date: Mon, 9 Jan 2017 19:37:01 +0300 Subject: [PATCH] =?UTF-8?q?PR-35=20=D0=9F=D1=80=D0=BE=D1=81=D0=BC=D0=BE?= =?UTF-8?q?=D1=82=D1=80=20=D0=BB=D0=B8=D1=87=D0=BD=D1=8B=D1=85=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=B7=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлено перенаправление на страницу регистрации, при просмотре контактов без регистрации Поправлены мелкие ошибки в редактировании профиля пользователя --- assets/js/build/create_project.js | 4 +- assets/js/build/create_worksell.js | 2 + assets/js/build/custom_components.js | 135 ++++++++++++++++++ assets/js/build/customer_profile.js | 13 +- assets/js/build/home_page.js | 4 +- assets/js/build/init_contractor_filter.js | 35 ++--- assets/js/build/init_create_worksell.js | 59 ++++---- .../js/build/init_customer_project_create.js | 59 ++++---- assets/js/build/init_modal_realty_edit.js | 59 ++++---- assets/js/build/init_portfolio_create_edit.js | 53 +++---- assets/js/build/init_worksell_filter.js | 35 ++--- assets/js/build/registration.js | 124 ++++++++++++++++ assets/js/build/user_profile_edit.js | 59 +++++++- assets/js/src/custom_components.js | 7 + assets/js/src/registration.js | 15 ++ assets/js/src/seeds/custom_select.js | 33 +++++ assets/js/src/seeds/popups.js | 2 + assets/js/src/user_profile_edit.js | 2 + templates/partials/inc-registration_form.html | 27 +++- templates/partials/sass/popups.sass | 3 +- templates/registration/registration_form.html | 38 +++-- webpack.config.js | 4 + work_sell/templates/worksell_detail.html | 7 +- 23 files changed, 604 insertions(+), 175 deletions(-) create mode 100644 assets/js/build/custom_components.js create mode 100644 assets/js/build/registration.js create mode 100644 assets/js/src/custom_components.js create mode 100644 assets/js/src/registration.js create mode 100644 assets/js/src/seeds/custom_select.js diff --git a/assets/js/build/create_project.js b/assets/js/build/create_project.js index 4cc450a..1272ead 100644 --- a/assets/js/build/create_project.js +++ b/assets/js/build/create_project.js @@ -1,4 +1,4 @@ -/******/ (function(modules) { // webpackBootstrap +/******/ (function(http://127.0.0.1:8000/work_sell/1049/modules) { // webpackBootstrap /******/ // The module cache /******/ var installedModules = {}; @@ -315,6 +315,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); + //Message TYPES: see in 'popups.sass' + function showMessage(container, template, message, type) { var $popup = $(template); $popup.hide(); diff --git a/assets/js/build/create_worksell.js b/assets/js/build/create_worksell.js index 814c155..2bfaada 100644 --- a/assets/js/build/create_worksell.js +++ b/assets/js/build/create_worksell.js @@ -126,6 +126,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); + //Message TYPES: see in 'popups.sass' + function showMessage(container, template, message, type) { var $popup = $(template); $popup.hide(); diff --git a/assets/js/build/custom_components.js b/assets/js/build/custom_components.js new file mode 100644 index 0000000..55dc7fe --- /dev/null +++ b/assets/js/build/custom_components.js @@ -0,0 +1,135 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; + +/******/ // The require function +/******/ function __webpack_require__(moduleId) { + +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; + +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ exports: {}, +/******/ id: moduleId, +/******/ loaded: false +/******/ }; + +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); + +/******/ // Flag the module as loaded +/******/ module.loaded = true; + +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } + + +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; + +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; + +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; + +/******/ // Load entry module and return exports +/******/ return __webpack_require__(0); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 0: +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + var _custom_select = __webpack_require__(15); + + var _custom_check = __webpack_require__(1); + + $(function () { + (0, _custom_select.customSelectInit)(); + (0, _custom_check.customCheckInit)(); + }); + +/***/ }, + +/***/ 1: +/***/ function(module, exports) { + + "use strict"; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + function customCheckInit() { + function tuneCheckBoxes($boxes) { + var currentState = $boxes.find("input").prop("checked") ? 'checked' : 'not-checked'; + $boxes.find("div").hide(); + $boxes.find("div." + currentState).show(); + } + + var $boxes = $('.custom-check'); + tuneCheckBoxes($boxes); + $boxes.on("click", function (e) { + var inside_checkBox = $(e.target).parent().find("input"); + inside_checkBox.prop("checked", !inside_checkBox.prop("checked")); + tuneCheckBoxes($boxes); + e.preventDefault(); + return false; + }); + } + + exports.customCheckInit = customCheckInit; + +/***/ }, + +/***/ 15: +/***/ function(module, exports) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + function customSelectInit() { + // CUSTOM-SELECT + var $select_container = $('.custom-select'); + var $sc_headers = $select_container.find('.simple-select'); + var $sc_options = $select_container.find('.select-box-options'); + + $sc_options.hide(); + + $sc_headers.on("click", function (e) { + $(e.target).siblings('.select-box-options').show(); + }); + + var $options = $sc_options.find('li'); + $options.on("click", function (e) { + var target = $(e.target); + var header = target.closest('.select-box-options').siblings('.simple-select'); + var data = target.closest('.select-box-options').siblings('input[type=hidden]'); + header.val(target.html()); + data.val(target.data("id")); + // $sc_data.val($(e.target).data("id")); + $sc_options.hide(); + e.preventDefault(); + }); + $(document).click(function (event) { + //FIXME: запомнить на ком был клик, и не закрывать именно его + if ($(event.target).closest($select_container).length) { + return; + } + $sc_options.hide(); + }); + } + + exports.customSelectInit = customSelectInit; + +/***/ } + +/******/ }); \ No newline at end of file diff --git a/assets/js/build/customer_profile.js b/assets/js/build/customer_profile.js index c3c016e..1ace80c 100644 --- a/assets/js/build/customer_profile.js +++ b/assets/js/build/customer_profile.js @@ -46,11 +46,11 @@ 'use strict'; - var _show_hide = __webpack_require__(15); + var _show_hide = __webpack_require__(16); - var _bootstrap_tabs = __webpack_require__(16); + var _bootstrap_tabs = __webpack_require__(17); - var _sort_by = __webpack_require__(17); + var _sort_by = __webpack_require__(18); var _custom_check = __webpack_require__(1); @@ -149,7 +149,8 @@ /* 12 */, /* 13 */, /* 14 */, -/* 15 */ +/* 15 */, +/* 16 */ /***/ function(module, exports) { "use strict"; @@ -165,7 +166,7 @@ exports.toggler = toggler; /***/ }, -/* 16 */ +/* 17 */ /***/ function(module, exports) { "use strict"; @@ -200,7 +201,7 @@ exports.restoreTab = restoreTab; /***/ }, -/* 17 */ +/* 18 */ /***/ function(module, exports, __webpack_require__) { "use strict"; diff --git a/assets/js/build/home_page.js b/assets/js/build/home_page.js index 74f6e8d..1043326 100644 --- a/assets/js/build/home_page.js +++ b/assets/js/build/home_page.js @@ -47,7 +47,7 @@ 'use strict'; - var _popupYoutube = __webpack_require__(18); + var _popupYoutube = __webpack_require__(19); $(function () { (0, _popupYoutube.popupYoutubeInit)(); @@ -55,7 +55,7 @@ /***/ }, -/***/ 18: +/***/ 19: /***/ function(module, exports) { 'use strict'; diff --git a/assets/js/build/init_contractor_filter.js b/assets/js/build/init_contractor_filter.js index 8c556ad..40e1cd2 100644 --- a/assets/js/build/init_contractor_filter.js +++ b/assets/js/build/init_contractor_filter.js @@ -46,15 +46,15 @@ 'use strict'; - var _SelectedContainer = __webpack_require__(19); + var _SelectedContainer = __webpack_require__(20); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _NoTreeSelect = __webpack_require__(23); + var _NoTreeSelect = __webpack_require__(24); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(25); + var _TreeSelect = __webpack_require__(26); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); @@ -138,7 +138,8 @@ /* 16 */, /* 17 */, /* 18 */, -/* 19 */ +/* 19 */, +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -153,15 +154,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -393,7 +394,7 @@ exports.default = SelectedContainer; /***/ }, -/* 20 */ +/* 21 */ /***/ function(module, exports) { "use strict"; @@ -548,7 +549,7 @@ exports.default = DataTree; /***/ }, -/* 21 */ +/* 22 */ /***/ function(module, exports) { "use strict"; @@ -604,7 +605,7 @@ exports.default = NoTreeData; /***/ }, -/* 22 */ +/* 23 */ /***/ function(module, exports) { "use strict"; @@ -688,7 +689,7 @@ // export {onBind}; /***/ }, -/* 23 */ +/* 24 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -702,9 +703,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -765,7 +766,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 24 */ +/* 25 */ /***/ function(module, exports) { "use strict"; @@ -1316,7 +1317,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 25 */ +/* 26 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1330,9 +1331,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); diff --git a/assets/js/build/init_create_worksell.js b/assets/js/build/init_create_worksell.js index 503a7cc..dc2922f 100644 --- a/assets/js/build/init_create_worksell.js +++ b/assets/js/build/init_create_worksell.js @@ -46,27 +46,27 @@ 'use strict'; - var _SelectedContainer = __webpack_require__(19); + var _SelectedContainer = __webpack_require__(20); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _SelectedContainerCreate = __webpack_require__(26); + var _SelectedContainerCreate = __webpack_require__(27); var _SelectedContainerCreate2 = _interopRequireDefault(_SelectedContainerCreate); - var _NoTreeSelect = __webpack_require__(23); + var _NoTreeSelect = __webpack_require__(24); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(25); + var _TreeSelect = __webpack_require__(26); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); - var _SingleTreeSelect = __webpack_require__(27); + var _SingleTreeSelect = __webpack_require__(28); var _SingleTreeSelect2 = _interopRequireDefault(_SingleTreeSelect); - var _SelectOrCreate = __webpack_require__(28); + var _SelectOrCreate = __webpack_require__(29); var _SelectOrCreate2 = _interopRequireDefault(_SelectOrCreate); @@ -185,7 +185,8 @@ /* 16 */, /* 17 */, /* 18 */, -/* 19 */ +/* 19 */, +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -200,15 +201,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -440,7 +441,7 @@ exports.default = SelectedContainer; /***/ }, -/* 20 */ +/* 21 */ /***/ function(module, exports) { "use strict"; @@ -595,7 +596,7 @@ exports.default = DataTree; /***/ }, -/* 21 */ +/* 22 */ /***/ function(module, exports) { "use strict"; @@ -651,7 +652,7 @@ exports.default = NoTreeData; /***/ }, -/* 22 */ +/* 23 */ /***/ function(module, exports) { "use strict"; @@ -735,7 +736,7 @@ // export {onBind}; /***/ }, -/* 23 */ +/* 24 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -749,9 +750,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -812,7 +813,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 24 */ +/* 25 */ /***/ function(module, exports) { "use strict"; @@ -1363,7 +1364,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 25 */ +/* 26 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1377,9 +1378,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); @@ -1488,7 +1489,7 @@ exports.default = TreeSelect; /***/ }, -/* 26 */ +/* 27 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1504,11 +1505,11 @@ var _desc, _value, _class; - var _SelectedContainer2 = __webpack_require__(19); + var _SelectedContainer2 = __webpack_require__(20); var _SelectedContainer3 = _interopRequireDefault(_SelectedContainer2); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -1589,7 +1590,7 @@ exports.default = SelectedContainerCreate; /***/ }, -/* 27 */ +/* 28 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1601,9 +1602,9 @@ var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - var _AbsBaseSelect = __webpack_require__(24); + var _AbsBaseSelect = __webpack_require__(25); - var _TreeSelect2 = __webpack_require__(25); + var _TreeSelect2 = __webpack_require__(26); var _TreeSelect3 = _interopRequireDefault(_TreeSelect2); @@ -1684,7 +1685,7 @@ exports.default = SingleTreeSelect; /***/ }, -/* 28 */ +/* 29 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1698,9 +1699,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); diff --git a/assets/js/build/init_customer_project_create.js b/assets/js/build/init_customer_project_create.js index ad32cdd..6fd9edd 100644 --- a/assets/js/build/init_customer_project_create.js +++ b/assets/js/build/init_customer_project_create.js @@ -46,27 +46,27 @@ 'use strict'; - var _SelectedContainer = __webpack_require__(19); + var _SelectedContainer = __webpack_require__(20); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _SelectedContainerCreate = __webpack_require__(26); + var _SelectedContainerCreate = __webpack_require__(27); var _SelectedContainerCreate2 = _interopRequireDefault(_SelectedContainerCreate); - var _NoTreeSelect = __webpack_require__(23); + var _NoTreeSelect = __webpack_require__(24); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(25); + var _TreeSelect = __webpack_require__(26); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); - var _SingleTreeSelect = __webpack_require__(27); + var _SingleTreeSelect = __webpack_require__(28); var _SingleTreeSelect2 = _interopRequireDefault(_SingleTreeSelect); - var _SelectOrCreate = __webpack_require__(28); + var _SelectOrCreate = __webpack_require__(29); var _SelectOrCreate2 = _interopRequireDefault(_SelectOrCreate); @@ -230,7 +230,8 @@ /* 16 */, /* 17 */, /* 18 */, -/* 19 */ +/* 19 */, +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -245,15 +246,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -485,7 +486,7 @@ exports.default = SelectedContainer; /***/ }, -/* 20 */ +/* 21 */ /***/ function(module, exports) { "use strict"; @@ -640,7 +641,7 @@ exports.default = DataTree; /***/ }, -/* 21 */ +/* 22 */ /***/ function(module, exports) { "use strict"; @@ -696,7 +697,7 @@ exports.default = NoTreeData; /***/ }, -/* 22 */ +/* 23 */ /***/ function(module, exports) { "use strict"; @@ -780,7 +781,7 @@ // export {onBind}; /***/ }, -/* 23 */ +/* 24 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -794,9 +795,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -857,7 +858,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 24 */ +/* 25 */ /***/ function(module, exports) { "use strict"; @@ -1408,7 +1409,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 25 */ +/* 26 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1422,9 +1423,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); @@ -1533,7 +1534,7 @@ exports.default = TreeSelect; /***/ }, -/* 26 */ +/* 27 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1549,11 +1550,11 @@ var _desc, _value, _class; - var _SelectedContainer2 = __webpack_require__(19); + var _SelectedContainer2 = __webpack_require__(20); var _SelectedContainer3 = _interopRequireDefault(_SelectedContainer2); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -1634,7 +1635,7 @@ exports.default = SelectedContainerCreate; /***/ }, -/* 27 */ +/* 28 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1646,9 +1647,9 @@ var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - var _AbsBaseSelect = __webpack_require__(24); + var _AbsBaseSelect = __webpack_require__(25); - var _TreeSelect2 = __webpack_require__(25); + var _TreeSelect2 = __webpack_require__(26); var _TreeSelect3 = _interopRequireDefault(_TreeSelect2); @@ -1729,7 +1730,7 @@ exports.default = SingleTreeSelect; /***/ }, -/* 28 */ +/* 29 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1743,9 +1744,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); diff --git a/assets/js/build/init_modal_realty_edit.js b/assets/js/build/init_modal_realty_edit.js index c775487..cfa039c 100644 --- a/assets/js/build/init_modal_realty_edit.js +++ b/assets/js/build/init_modal_realty_edit.js @@ -46,27 +46,27 @@ 'use strict'; - var _SelectedContainer = __webpack_require__(19); + var _SelectedContainer = __webpack_require__(20); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _SelectedContainerCreate = __webpack_require__(26); + var _SelectedContainerCreate = __webpack_require__(27); var _SelectedContainerCreate2 = _interopRequireDefault(_SelectedContainerCreate); - var _NoTreeSelect = __webpack_require__(23); + var _NoTreeSelect = __webpack_require__(24); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(25); + var _TreeSelect = __webpack_require__(26); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); - var _SingleTreeSelect = __webpack_require__(27); + var _SingleTreeSelect = __webpack_require__(28); var _SingleTreeSelect2 = _interopRequireDefault(_SingleTreeSelect); - var _SelectOrCreate = __webpack_require__(28); + var _SelectOrCreate = __webpack_require__(29); var _SelectOrCreate2 = _interopRequireDefault(_SelectOrCreate); @@ -290,7 +290,8 @@ /* 16 */, /* 17 */, /* 18 */, -/* 19 */ +/* 19 */, +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -305,15 +306,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -545,7 +546,7 @@ exports.default = SelectedContainer; /***/ }, -/* 20 */ +/* 21 */ /***/ function(module, exports) { "use strict"; @@ -700,7 +701,7 @@ exports.default = DataTree; /***/ }, -/* 21 */ +/* 22 */ /***/ function(module, exports) { "use strict"; @@ -756,7 +757,7 @@ exports.default = NoTreeData; /***/ }, -/* 22 */ +/* 23 */ /***/ function(module, exports) { "use strict"; @@ -840,7 +841,7 @@ // export {onBind}; /***/ }, -/* 23 */ +/* 24 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -854,9 +855,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -917,7 +918,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 24 */ +/* 25 */ /***/ function(module, exports) { "use strict"; @@ -1468,7 +1469,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 25 */ +/* 26 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1482,9 +1483,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); @@ -1593,7 +1594,7 @@ exports.default = TreeSelect; /***/ }, -/* 26 */ +/* 27 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1609,11 +1610,11 @@ var _desc, _value, _class; - var _SelectedContainer2 = __webpack_require__(19); + var _SelectedContainer2 = __webpack_require__(20); var _SelectedContainer3 = _interopRequireDefault(_SelectedContainer2); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -1694,7 +1695,7 @@ exports.default = SelectedContainerCreate; /***/ }, -/* 27 */ +/* 28 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1706,9 +1707,9 @@ var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - var _AbsBaseSelect = __webpack_require__(24); + var _AbsBaseSelect = __webpack_require__(25); - var _TreeSelect2 = __webpack_require__(25); + var _TreeSelect2 = __webpack_require__(26); var _TreeSelect3 = _interopRequireDefault(_TreeSelect2); @@ -1789,7 +1790,7 @@ exports.default = SingleTreeSelect; /***/ }, -/* 28 */ +/* 29 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1803,9 +1804,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); diff --git a/assets/js/build/init_portfolio_create_edit.js b/assets/js/build/init_portfolio_create_edit.js index 418e1d8..120f626 100644 --- a/assets/js/build/init_portfolio_create_edit.js +++ b/assets/js/build/init_portfolio_create_edit.js @@ -46,23 +46,23 @@ 'use strict'; - var _SelectedContainer = __webpack_require__(19); + var _SelectedContainer = __webpack_require__(20); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _SelectedContainerCreate = __webpack_require__(26); + var _SelectedContainerCreate = __webpack_require__(27); var _SelectedContainerCreate2 = _interopRequireDefault(_SelectedContainerCreate); - var _NoTreeSelect = __webpack_require__(23); + var _NoTreeSelect = __webpack_require__(24); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(25); + var _TreeSelect = __webpack_require__(26); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); - var _SelectOrCreate = __webpack_require__(28); + var _SelectOrCreate = __webpack_require__(29); var _SelectOrCreate2 = _interopRequireDefault(_SelectOrCreate); @@ -140,7 +140,8 @@ /* 16 */, /* 17 */, /* 18 */, -/* 19 */ +/* 19 */, +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -155,15 +156,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -395,7 +396,7 @@ exports.default = SelectedContainer; /***/ }, -/* 20 */ +/* 21 */ /***/ function(module, exports) { "use strict"; @@ -550,7 +551,7 @@ exports.default = DataTree; /***/ }, -/* 21 */ +/* 22 */ /***/ function(module, exports) { "use strict"; @@ -606,7 +607,7 @@ exports.default = NoTreeData; /***/ }, -/* 22 */ +/* 23 */ /***/ function(module, exports) { "use strict"; @@ -690,7 +691,7 @@ // export {onBind}; /***/ }, -/* 23 */ +/* 24 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -704,9 +705,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -767,7 +768,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 24 */ +/* 25 */ /***/ function(module, exports) { "use strict"; @@ -1318,7 +1319,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 25 */ +/* 26 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1332,9 +1333,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); @@ -1443,7 +1444,7 @@ exports.default = TreeSelect; /***/ }, -/* 26 */ +/* 27 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1459,11 +1460,11 @@ var _desc, _value, _class; - var _SelectedContainer2 = __webpack_require__(19); + var _SelectedContainer2 = __webpack_require__(20); var _SelectedContainer3 = _interopRequireDefault(_SelectedContainer2); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -1544,8 +1545,8 @@ exports.default = SelectedContainerCreate; /***/ }, -/* 27 */, -/* 28 */ +/* 28 */, +/* 29 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1559,9 +1560,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); diff --git a/assets/js/build/init_worksell_filter.js b/assets/js/build/init_worksell_filter.js index e2961d7..257de54 100644 --- a/assets/js/build/init_worksell_filter.js +++ b/assets/js/build/init_worksell_filter.js @@ -46,15 +46,15 @@ 'use strict'; - var _SelectedContainer = __webpack_require__(19); + var _SelectedContainer = __webpack_require__(20); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _NoTreeSelect = __webpack_require__(23); + var _NoTreeSelect = __webpack_require__(24); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(25); + var _TreeSelect = __webpack_require__(26); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); @@ -138,7 +138,8 @@ /* 16 */, /* 17 */, /* 18 */, -/* 19 */ +/* 19 */, +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -153,15 +154,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(22); + var _decorators = __webpack_require__(23); var _decorators2 = _interopRequireDefault(_decorators); @@ -393,7 +394,7 @@ exports.default = SelectedContainer; /***/ }, -/* 20 */ +/* 21 */ /***/ function(module, exports) { "use strict"; @@ -548,7 +549,7 @@ exports.default = DataTree; /***/ }, -/* 21 */ +/* 22 */ /***/ function(module, exports) { "use strict"; @@ -604,7 +605,7 @@ exports.default = NoTreeData; /***/ }, -/* 22 */ +/* 23 */ /***/ function(module, exports) { "use strict"; @@ -688,7 +689,7 @@ // export {onBind}; /***/ }, -/* 23 */ +/* 24 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -702,9 +703,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _NoTreeData = __webpack_require__(21); + var _NoTreeData = __webpack_require__(22); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -765,7 +766,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 24 */ +/* 25 */ /***/ function(module, exports) { "use strict"; @@ -1316,7 +1317,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 25 */ +/* 26 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1330,9 +1331,9 @@ var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - var _AbsBaseSelect2 = __webpack_require__(24); + var _AbsBaseSelect2 = __webpack_require__(25); - var _DataTree = __webpack_require__(20); + var _DataTree = __webpack_require__(21); var _DataTree2 = _interopRequireDefault(_DataTree); diff --git a/assets/js/build/registration.js b/assets/js/build/registration.js new file mode 100644 index 0000000..47bfc2c --- /dev/null +++ b/assets/js/build/registration.js @@ -0,0 +1,124 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; + +/******/ // The require function +/******/ function __webpack_require__(moduleId) { + +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; + +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ exports: {}, +/******/ id: moduleId, +/******/ loaded: false +/******/ }; + +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); + +/******/ // Flag the module as loaded +/******/ module.loaded = true; + +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } + + +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; + +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; + +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; + +/******/ // Load entry module and return exports +/******/ return __webpack_require__(0); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 0: +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + var _popups = __webpack_require__(9); + + function checkHash() { + // on load of the page: switch to the currently selected tab + var hash = window.location.hash; + console.log("hash = ", hash); + if (hash == '#need-login-for-view') { + (0, _popups.addMessage)('Для просмотра личных данных необходимо зарегистрироваться', 'info'); + } + } + + $(function () { + (0, _popups.showPopupsInit)(); + checkHash(); + }); + +/***/ }, + +/***/ 9: +/***/ function(module, exports) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + //Message TYPES: see in 'popups.sass' + + function showMessage(container, template, message, type) { + var $popup = $(template); + $popup.hide(); + $popup.find('.message').html(message); + $popup.addClass(type); + container.append($popup); + $popup.fadeIn(1000, function () { + setTimeout(function (el) { + $(el).fadeOut(1000); + }, 2000, this); + }); + } + + function addMessage(message, type) { + var $popups_storage = $('#popups-storage'); + var li = '
  • ' + message + '
    • '; + $popups_storage.append(li); + } + + function showPopupsInit() { + var $popups_storage = $('#popups-storage'); + var $popups_container = $('#popups-container'); + var $popup = $popups_container.find(".popup"); + var popup_html = $popup[0].outerHTML; + $popup.remove(); + if (!$popups_storage.length) return; + $.each($popups_storage.find("li"), function (key, value) { + var message = $(value).html(); + var type = $(value).attr('class'); + showMessage($popups_container, popup_html, message, type); + $(value).remove(); + }); + $popups_storage.bind("DOMNodeInserted", function () { + var $li = $(this).find('li'); + var message = $li.html(); + var type = $li.attr('class'); + $li.remove(); + showMessage($popups_container, popup_html, message, type); + }); + } + + exports.showPopupsInit = showPopupsInit; + exports.addMessage = addMessage; + +/***/ } + +/******/ }); \ No newline at end of file diff --git a/assets/js/build/user_profile_edit.js b/assets/js/build/user_profile_edit.js index 556e37c..d022c14 100644 --- a/assets/js/build/user_profile_edit.js +++ b/assets/js/build/user_profile_edit.js @@ -47,21 +47,68 @@ 'use strict'; - var _avatar_upload = __webpack_require__(29); + var _avatar_upload = __webpack_require__(30); - var _bootstrap_tabs = __webpack_require__(16); + var _bootstrap_tabs = __webpack_require__(17); - var _user_check_statuses = __webpack_require__(30); + var _user_check_statuses = __webpack_require__(31); + + var _custom_select = __webpack_require__(15); $(function () { (0, _avatar_upload.avatarUploadInit)(); (0, _bootstrap_tabs.tabsHashInit)(); (0, _user_check_statuses.checkBoxBindingInit)(); + (0, _custom_select.customSelectInit)(); + }); + +/***/ }, + +/***/ 15: +/***/ function(module, exports) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true }); + function customSelectInit() { + // CUSTOM-SELECT + var $select_container = $('.custom-select'); + var $sc_headers = $select_container.find('.simple-select'); + var $sc_options = $select_container.find('.select-box-options'); + + $sc_options.hide(); + + $sc_headers.on("click", function (e) { + $(e.target).siblings('.select-box-options').show(); + }); + + var $options = $sc_options.find('li'); + $options.on("click", function (e) { + var target = $(e.target); + var header = target.closest('.select-box-options').siblings('.simple-select'); + var data = target.closest('.select-box-options').siblings('input[type=hidden]'); + header.val(target.html()); + data.val(target.data("id")); + // $sc_data.val($(e.target).data("id")); + $sc_options.hide(); + e.preventDefault(); + }); + $(document).click(function (event) { + //FIXME: запомнить на ком был клик, и не закрывать именно его + if ($(event.target).closest($select_container).length) { + return; + } + $sc_options.hide(); + }); + } + + exports.customSelectInit = customSelectInit; /***/ }, -/***/ 16: +/***/ 17: /***/ function(module, exports) { "use strict"; @@ -97,7 +144,7 @@ /***/ }, -/***/ 29: +/***/ 30: /***/ function(module, exports) { 'use strict'; @@ -150,7 +197,7 @@ /***/ }, -/***/ 30: +/***/ 31: /***/ function(module, exports) { 'use strict'; diff --git a/assets/js/src/custom_components.js b/assets/js/src/custom_components.js new file mode 100644 index 0000000..1cc166b --- /dev/null +++ b/assets/js/src/custom_components.js @@ -0,0 +1,7 @@ +import {customSelectInit} from './seeds/custom_select' +import {customCheckInit} from './seeds/custom_check' + +$(function () { + customSelectInit(); + customCheckInit(); +}); \ No newline at end of file diff --git a/assets/js/src/registration.js b/assets/js/src/registration.js new file mode 100644 index 0000000..4a30b75 --- /dev/null +++ b/assets/js/src/registration.js @@ -0,0 +1,15 @@ +import {showPopupsInit, addMessage} from './seeds/popups' + +function checkHash() { + // on load of the page: switch to the currently selected tab + let hash = window.location.hash; + console.log("hash = ", hash); + if (hash == '#need-login-for-view'){ + addMessage('Для просмотра личных данных необходимо зарегистрироваться', 'info'); + } +} + +$(function(){ + showPopupsInit(); + checkHash(); +}); \ No newline at end of file diff --git a/assets/js/src/seeds/custom_select.js b/assets/js/src/seeds/custom_select.js new file mode 100644 index 0000000..a7d44be --- /dev/null +++ b/assets/js/src/seeds/custom_select.js @@ -0,0 +1,33 @@ +function customSelectInit() { + // CUSTOM-SELECT + let $select_container = $('.custom-select'); + let $sc_headers = $select_container.find('.simple-select'); + let $sc_options = $select_container.find('.select-box-options'); + + $sc_options.hide(); + + $sc_headers.on("click", function (e) { + $(e.target).siblings('.select-box-options').show(); + }); + + let $options = $sc_options.find('li'); + $options.on("click", function (e) { + const target = $(e.target); + let header = target.closest('.select-box-options').siblings('.simple-select'); + let data = target.closest('.select-box-options').siblings('input[type=hidden]'); + header.val(target.html()); + data.val(target.data("id")); + // $sc_data.val($(e.target).data("id")); + $sc_options.hide(); + e.preventDefault() + }); + $(document).click(function (event) { + //FIXME: запомнить на ком был клик, и не закрывать именно его + if ($(event.target).closest($select_container).length) { + return; + } + $sc_options.hide(); + }); +} + +export {customSelectInit} \ No newline at end of file diff --git a/assets/js/src/seeds/popups.js b/assets/js/src/seeds/popups.js index 03d3e65..bbfc6e8 100644 --- a/assets/js/src/seeds/popups.js +++ b/assets/js/src/seeds/popups.js @@ -1,3 +1,5 @@ +//Message TYPES: see in 'popups.sass' + function showMessage(container, template, message, type) { let $popup = $(template); $popup.hide(); diff --git a/assets/js/src/user_profile_edit.js b/assets/js/src/user_profile_edit.js index 4332002..9e288b2 100644 --- a/assets/js/src/user_profile_edit.js +++ b/assets/js/src/user_profile_edit.js @@ -1,9 +1,11 @@ import {avatarUploadInit} from './seeds/avatar_upload' import {tabsHashInit, restoreTab} from './seeds/bootstrap_tabs' import {checkBoxBindingInit} from './seeds/user_check_statuses' +import {customSelectInit} from './seeds/custom_select' $(function () { avatarUploadInit(); tabsHashInit(); checkBoxBindingInit(); + customSelectInit(); }); \ No newline at end of file diff --git a/templates/partials/inc-registration_form.html b/templates/partials/inc-registration_form.html index bb8eb96..98decff 100644 --- a/templates/partials/inc-registration_form.html +++ b/templates/partials/inc-registration_form.html @@ -1,13 +1,34 @@ {% load sass_tags %} +{% load static %}
    {% csrf_token %} {{ form.non_field_errors }} {% if not hide_user_type %} -
    - {{ form.user_type }} - {{ form.user_type.errors }} +
    +
    + +
    +
    + + + +
    +
    + {{ form.user_type.errors }} +
    {% endif %} diff --git a/templates/partials/sass/popups.sass b/templates/partials/sass/popups.sass index aef056e..3c59074 100644 --- a/templates/partials/sass/popups.sass +++ b/templates/partials/sass/popups.sass @@ -1,7 +1,7 @@ .popups-container width: 100% position: fixed - top: 0 + top: 75px left: 0 opacity: 0.8 .popup @@ -20,6 +20,7 @@ color: white width: 100% text-align: center + // MESSAGE TYPES &.warning background-color: #ffc649 &.error diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index f5f0449..a9ee992 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -1,14 +1,36 @@ -{% extends 'partials/base.html' %} +{% extends 'partials/_base.html' %} +{% load sass_tags %} +{% load static %} +{% block personal_css %} + + + +{% endblock %} {% block content %} - {% include 'partials/header.html' %} -
    +
    -

    Регистрация

    -
    - {% include 'partials/inc-registration_form.html' %} +
    +
    +

    + Регистрация +

    - {% include 'partials/footer.html' %} -
    +
    + +
    + {% include 'partials/inc-registration_form.html' %} +
    + + {% include 'partials/inc-message-popup.html' %} +
    {% endblock %} +{% block personal_js %} + + +{% endblock %} \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 9d39712..570f40b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,6 +8,8 @@ module.exports = { // context: path.join(__dirname, "static", "js"), entry: { + //Common + custom_components: "./assets/js/src/custom_components.js", // projects create_project: "./assets/js/src/customer_project_create.js", init_customer_project_create: './assets/js/src/init_customer_project_create.js', @@ -30,6 +32,8 @@ module.exports = { portfolio_create_edit: "./assets/js/src/portfolio_create_edit.js", //modal Realty edit init_modal_realty_edit: "./assets/js/src/init_modal_realty_edit.js", + //registration + registration: "./assets/js/src/registration.js", }, output: { diff --git a/work_sell/templates/worksell_detail.html b/work_sell/templates/worksell_detail.html index 95aad86..af69c43 100644 --- a/work_sell/templates/worksell_detail.html +++ b/work_sell/templates/worksell_detail.html @@ -49,7 +49,12 @@ {% endif %} {% if not self_worksell %}
    - + посмотреть контакты