diff --git a/assets/js/build/create_project.js b/assets/js/build/create_project.js index ed3f899..32a9589 100644 --- a/assets/js/build/create_project.js +++ b/assets/js/build/create_project.js @@ -58,9 +58,9 @@ var _popups = __webpack_require__(7); - var _scroll_on_required = __webpack_require__(19); + var _scroll_on_required = __webpack_require__(8); - var _test_seeds = __webpack_require__(8); + var _test_seeds = __webpack_require__(9); function showHideRealry() { var check = $('#checkbox-sb-realty'); @@ -351,46 +351,36 @@ /* 8 */ /***/ function(module, exports) { - "use strict"; + 'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); - function print(text) { - console.log(text); + function scrollOnRequiredInit() { + var $required = $('.required.error'); + // console.log($required); + if (!$required.length) return; + $('html, body').animate({ + scrollTop: $required.offset().top - 25 + }, 1000); } - exports.print = print; + exports.scrollOnRequiredInit = scrollOnRequiredInit; /***/ }, -/* 9 */, -/* 10 */, -/* 11 */, -/* 12 */, -/* 13 */, -/* 14 */, -/* 15 */, -/* 16 */, -/* 17 */, -/* 18 */, -/* 19 */ +/* 9 */ /***/ function(module, exports) { - 'use strict'; + "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); - function scrollOnRequiredInit() { - var $required = $('.required.error'); - // console.log($required); - if (!$required.length) return; - $('html, body').animate({ - scrollTop: $required.offset().top - 25 - }, 1000); + function print(text) { + console.log(text); } - exports.scrollOnRequiredInit = scrollOnRequiredInit; + exports.print = print; /***/ } /******/ ]); \ No newline at end of file diff --git a/assets/js/build/create_worksell.js b/assets/js/build/create_worksell.js index 4a50705..49f7100 100644 --- a/assets/js/build/create_worksell.js +++ b/assets/js/build/create_worksell.js @@ -40,18 +40,17 @@ /******/ return __webpack_require__(0); /******/ }) /************************************************************************/ -/******/ ({ - -/***/ 0: +/******/ ([ +/* 0 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; var _file_upload = __webpack_require__(1); - var _image_upload = __webpack_require__(20); + var _image_upload = __webpack_require__(10); - var _scroll_on_required = __webpack_require__(19); + var _scroll_on_required = __webpack_require__(8); var _popups = __webpack_require__(7); @@ -65,8 +64,7 @@ }); /***/ }, - -/***/ 1: +/* 1 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -114,8 +112,7 @@ exports.fileUploadInit = fileUploadInit; /***/ }, - -/***/ 2: +/* 2 */ /***/ function(module, exports) { 'use strict'; @@ -159,8 +156,11 @@ exports.getCookie = getCookie; /***/ }, - -/***/ 7: +/* 3 */, +/* 4 */, +/* 5 */, +/* 6 */, +/* 7 */ /***/ function(module, exports) { 'use strict'; @@ -213,8 +213,7 @@ exports.addMessage = addMessage; /***/ }, - -/***/ 19: +/* 8 */ /***/ function(module, exports) { 'use strict'; @@ -234,8 +233,8 @@ exports.scrollOnRequiredInit = scrollOnRequiredInit; /***/ }, - -/***/ 20: +/* 9 */, +/* 10 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -277,7 +276,7 @@ $fileUploadContainer.on('change', '.file-upload-input', function ($evt) { var $fileInput = $(this); var $fileUploadWidget = $fileInput.closest('.file-upload-widget'); - var $fileImg = $fileUploadWidget.find('img'); + var $fileImg = $fileUploadWidget.find('.preview'); var filePath = $fileInput.val().replace(/\\/g, '/'); var fileName = path.basename(filePath); var fileSize = $fileInput.get(0).files && (0, _utils.humanFileSize)($fileInput.get(0).files[0].size); @@ -294,9 +293,12 @@ $fileUploadWidget.css('display', 'block'); if ($fileImg.length) { + console.log('+'); var reader = new FileReader(); reader.onload = function (e) { - $fileImg.attr('src', e.target.result); + // document.getElementById('clock').style.backgroundImage = "url(" + reader.result + ")"; + $fileImg.css('background-image', 'url(' + e.target.result + ')'); + // $fileImg.attr('src', e.target.result); }; reader.readAsDataURL($fileInput[0].files[0]); @@ -313,5 +315,4 @@ // export {imageUploadInit, previewImg} /***/ } - -/******/ }); \ No newline at end of file +/******/ ]); \ No newline at end of file diff --git a/assets/js/build/init_create_worksell.js b/assets/js/build/init_create_worksell.js index babe985..6f48517 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__(9); + var _SelectedContainer = __webpack_require__(11); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _SelectedContainerCreate = __webpack_require__(13); + var _SelectedContainerCreate = __webpack_require__(15); var _SelectedContainerCreate2 = _interopRequireDefault(_SelectedContainerCreate); - var _NoTreeSelect = __webpack_require__(14); + var _NoTreeSelect = __webpack_require__(16); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(16); + var _TreeSelect = __webpack_require__(18); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); - var _SingleTreeSelect = __webpack_require__(17); + var _SingleTreeSelect = __webpack_require__(19); var _SingleTreeSelect2 = _interopRequireDefault(_SingleTreeSelect); - var _SelectOrCreate = __webpack_require__(18); + var _SelectOrCreate = __webpack_require__(20); var _SelectOrCreate2 = _interopRequireDefault(_SelectOrCreate); @@ -175,7 +175,9 @@ /* 6 */, /* 7 */, /* 8 */, -/* 9 */ +/* 9 */, +/* 10 */, +/* 11 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -190,15 +192,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(10); + var _DataTree = __webpack_require__(12); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(11); + var _NoTreeData = __webpack_require__(13); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(12); + var _decorators = __webpack_require__(14); var _decorators2 = _interopRequireDefault(_decorators); @@ -429,7 +431,7 @@ exports.default = SelectedContainer; /***/ }, -/* 10 */ +/* 12 */ /***/ function(module, exports) { "use strict"; @@ -584,7 +586,7 @@ exports.default = DataTree; /***/ }, -/* 11 */ +/* 13 */ /***/ function(module, exports) { "use strict"; @@ -640,7 +642,7 @@ exports.default = NoTreeData; /***/ }, -/* 12 */ +/* 14 */ /***/ function(module, exports) { "use strict"; @@ -724,7 +726,7 @@ // export {onBind}; /***/ }, -/* 13 */ +/* 15 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -740,11 +742,11 @@ var _desc, _value, _class; - var _SelectedContainer2 = __webpack_require__(9); + var _SelectedContainer2 = __webpack_require__(11); var _SelectedContainer3 = _interopRequireDefault(_SelectedContainer2); - var _decorators = __webpack_require__(12); + var _decorators = __webpack_require__(14); var _decorators2 = _interopRequireDefault(_decorators); @@ -825,7 +827,7 @@ exports.default = SelectedContainerCreate; /***/ }, -/* 14 */ +/* 16 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -839,9 +841,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__(15); + var _AbsBaseSelect2 = __webpack_require__(17); - var _NoTreeData = __webpack_require__(11); + var _NoTreeData = __webpack_require__(13); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -908,7 +910,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 15 */ +/* 17 */ /***/ function(module, exports) { "use strict"; @@ -1452,7 +1454,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 16 */ +/* 18 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1466,9 +1468,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__(15); + var _AbsBaseSelect2 = __webpack_require__(17); - var _DataTree = __webpack_require__(10); + var _DataTree = __webpack_require__(12); var _DataTree2 = _interopRequireDefault(_DataTree); @@ -1577,7 +1579,7 @@ exports.default = TreeSelect; /***/ }, -/* 17 */ +/* 19 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1589,9 +1591,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__(15); + var _AbsBaseSelect = __webpack_require__(17); - var _TreeSelect2 = __webpack_require__(16); + var _TreeSelect2 = __webpack_require__(18); var _TreeSelect3 = _interopRequireDefault(_TreeSelect2); @@ -1672,7 +1674,7 @@ exports.default = SingleTreeSelect; /***/ }, -/* 18 */ +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1686,9 +1688,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__(15); + var _AbsBaseSelect2 = __webpack_require__(17); - var _NoTreeData = __webpack_require__(11); + var _NoTreeData = __webpack_require__(13); 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 42a148c..db7b9c4 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__(9); + var _SelectedContainer = __webpack_require__(11); var _SelectedContainer2 = _interopRequireDefault(_SelectedContainer); - var _SelectedContainerCreate = __webpack_require__(13); + var _SelectedContainerCreate = __webpack_require__(15); var _SelectedContainerCreate2 = _interopRequireDefault(_SelectedContainerCreate); - var _NoTreeSelect = __webpack_require__(14); + var _NoTreeSelect = __webpack_require__(16); var _NoTreeSelect2 = _interopRequireDefault(_NoTreeSelect); - var _TreeSelect = __webpack_require__(16); + var _TreeSelect = __webpack_require__(18); var _TreeSelect2 = _interopRequireDefault(_TreeSelect); - var _SingleTreeSelect = __webpack_require__(17); + var _SingleTreeSelect = __webpack_require__(19); var _SingleTreeSelect2 = _interopRequireDefault(_SingleTreeSelect); - var _SelectOrCreate = __webpack_require__(18); + var _SelectOrCreate = __webpack_require__(20); var _SelectOrCreate2 = _interopRequireDefault(_SelectOrCreate); @@ -210,7 +210,9 @@ /* 6 */, /* 7 */, /* 8 */, -/* 9 */ +/* 9 */, +/* 10 */, +/* 11 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -225,15 +227,15 @@ var _desc, _value, _class; // ` - var _DataTree = __webpack_require__(10); + var _DataTree = __webpack_require__(12); var _DataTree2 = _interopRequireDefault(_DataTree); - var _NoTreeData = __webpack_require__(11); + var _NoTreeData = __webpack_require__(13); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); - var _decorators = __webpack_require__(12); + var _decorators = __webpack_require__(14); var _decorators2 = _interopRequireDefault(_decorators); @@ -464,7 +466,7 @@ exports.default = SelectedContainer; /***/ }, -/* 10 */ +/* 12 */ /***/ function(module, exports) { "use strict"; @@ -619,7 +621,7 @@ exports.default = DataTree; /***/ }, -/* 11 */ +/* 13 */ /***/ function(module, exports) { "use strict"; @@ -675,7 +677,7 @@ exports.default = NoTreeData; /***/ }, -/* 12 */ +/* 14 */ /***/ function(module, exports) { "use strict"; @@ -759,7 +761,7 @@ // export {onBind}; /***/ }, -/* 13 */ +/* 15 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -775,11 +777,11 @@ var _desc, _value, _class; - var _SelectedContainer2 = __webpack_require__(9); + var _SelectedContainer2 = __webpack_require__(11); var _SelectedContainer3 = _interopRequireDefault(_SelectedContainer2); - var _decorators = __webpack_require__(12); + var _decorators = __webpack_require__(14); var _decorators2 = _interopRequireDefault(_decorators); @@ -860,7 +862,7 @@ exports.default = SelectedContainerCreate; /***/ }, -/* 14 */ +/* 16 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -874,9 +876,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__(15); + var _AbsBaseSelect2 = __webpack_require__(17); - var _NoTreeData = __webpack_require__(11); + var _NoTreeData = __webpack_require__(13); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); @@ -943,7 +945,7 @@ exports.default = NoTreeSelect; /***/ }, -/* 15 */ +/* 17 */ /***/ function(module, exports) { "use strict"; @@ -1487,7 +1489,7 @@ exports.AbsBaseSelect = AbsBaseSelect; /***/ }, -/* 16 */ +/* 18 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1501,9 +1503,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__(15); + var _AbsBaseSelect2 = __webpack_require__(17); - var _DataTree = __webpack_require__(10); + var _DataTree = __webpack_require__(12); var _DataTree2 = _interopRequireDefault(_DataTree); @@ -1612,7 +1614,7 @@ exports.default = TreeSelect; /***/ }, -/* 17 */ +/* 19 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1624,9 +1626,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__(15); + var _AbsBaseSelect = __webpack_require__(17); - var _TreeSelect2 = __webpack_require__(16); + var _TreeSelect2 = __webpack_require__(18); var _TreeSelect3 = _interopRequireDefault(_TreeSelect2); @@ -1707,7 +1709,7 @@ exports.default = SingleTreeSelect; /***/ }, -/* 18 */ +/* 20 */ /***/ function(module, exports, __webpack_require__) { 'use strict'; @@ -1721,9 +1723,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__(15); + var _AbsBaseSelect2 = __webpack_require__(17); - var _NoTreeData = __webpack_require__(11); + var _NoTreeData = __webpack_require__(13); var _NoTreeData2 = _interopRequireDefault(_NoTreeData); diff --git a/assets/js/src/seeds/image_upload.js b/assets/js/src/seeds/image_upload.js index af7a602..76700a5 100644 --- a/assets/js/src/seeds/image_upload.js +++ b/assets/js/src/seeds/image_upload.js @@ -31,7 +31,7 @@ function imageUploadInit() { $fileUploadContainer.on('change', '.file-upload-input', function ($evt) { var $fileInput = $(this); var $fileUploadWidget = $fileInput.closest('.file-upload-widget'); - let $fileImg = $fileUploadWidget.find('img'); + let $fileImg = $fileUploadWidget.find('.preview'); var filePath = $fileInput.val().replace(/\\/g, '/'); var fileName = path.basename(filePath); var fileSize = $fileInput.get(0).files && humanFileSize($fileInput.get(0).files[0].size); @@ -50,7 +50,7 @@ function imageUploadInit() { if ($fileImg.length) { let reader = new FileReader(); reader.onload = function (e) { - $fileImg.attr('src', e.target.result); + $fileImg.css('background-image', 'url('+e.target.result +')'); }; reader.readAsDataURL($fileInput[0].files[0]); diff --git a/assets/js/src/seeds/send_data.js b/assets/js/src/seeds/send_data.js new file mode 100644 index 0000000..29a9743 --- /dev/null +++ b/assets/js/src/seeds/send_data.js @@ -0,0 +1,6 @@ +function sendData(){ + $.ajax({ + url: '', + + }) +} \ No newline at end of file diff --git a/assets/sass/components/custom-components.sass b/assets/sass/components/custom-components.sass index c84253d..11d2301 100644 --- a/assets/sass/components/custom-components.sass +++ b/assets/sass/components/custom-components.sass @@ -135,12 +135,6 @@ textarea.description width: auto text-align: right -.file-upload-widget - .preview - width: 100% - height: 200px - margin-bottom: 10px - .separator margin-top: 35px margin-bottom: 15px @@ -224,11 +218,11 @@ textarea.description height: 16px background: url('#{$static}/img/aui-icon-close.png') no-repeat center cursor: pointer - //padding: px + //padding: px .preview-container position: relative - display: inline-block + //display: inline-block .file-upload-remove-img-btn position: absolute top: 0 @@ -239,6 +233,16 @@ textarea.description resize: vertical max-height: 68px + .file-upload-widget + .preview + width: 100% + height: 200px + background: + repeat: no-repeat + position-x: center + position-y: center + size: cover + .complete display: none diff --git a/work_sell/forms.py b/work_sell/forms.py index 1132cf3..6e2a289 100644 --- a/work_sell/forms.py +++ b/work_sell/forms.py @@ -55,7 +55,10 @@ class WorkSellForm(forms.ModelForm): # return data def __init__(self, *args, **kwargs): - self.request = kwargs.pop('request') + try: + self.request = kwargs.pop('request') + except KeyError: + pass super().__init__(*args, **kwargs) self.fields['specializations'].required = True self.fields['description'].required = True diff --git a/work_sell/templates/worksell_create.html b/work_sell/templates/worksell_create.html index 763a1d9..32c7537 100644 --- a/work_sell/templates/worksell_create.html +++ b/work_sell/templates/worksell_create.html @@ -132,7 +132,7 @@ style="position: absolute; top: -1000px; left: -1000px">
- your image +